From 11b0afdd4a325387ebc6e9204d64ccf952a3e1a3 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 25 May 2023 18:04:26 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20http://jira.mfd.msk:8088/browse/C?= =?UTF-8?q?LS-331=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B5=D0=BA=D1=81=D0=B5=D1=81=D1=82=D0=BE=D0=B2,=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?meta=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B4=D0=B0=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/cud/account/AccountNewAction.java | 12 ---------- .../cud/account/AccountUpdateAction.java | 10 -------- .../cud/account/BankAccountNewAction.java | 13 ----------- .../cud/account/BankAccountUpdateAction.java | 5 ---- .../cud/account/ClientCodeNewAction.java | 10 -------- .../cud/account/ClientCodeUpdateAction.java | 7 ------ .../payment/PIClearingOutbondActionNew.java | 10 -------- .../cud/registry/RSplitDepositActionNew.java | 11 --------- .../TradingClearingRegistryNewAction.java | 9 -------- .../TradingClearingRegistryUpdateAction.java | 9 -------- .../schedule/ClearingCalendarNewAction.java | 12 ---------- .../ClearingCalendarUpdateAction.java | 15 ------------ .../cud/schedule/PlannerNewAction.java | 17 -------------- .../schedule/PlannerTemplateNewAction.java | 14 ----------- .../schedule/PlannerTemplateUpdateAction.java | 17 -------------- .../cud/schedule/PlannerUpdateAction.java | 21 ----------------- .../securities/EquitySecurityNewAction.java | 14 ----------- .../EquitySecurityUpdateAction.java | 7 ------ .../FixedIncomeSecurityNewAction.java | 13 ----------- .../FixedIncomeSecurityUpdateAction.java | 8 ------- .../MoneyMarketSecurityNewAction.java | 23 ------------------- .../MoneyMarketSecurityUpdateAction.java | 8 ------- .../validation/ActionMetaValidation.java | 2 +- 23 files changed, 1 insertion(+), 266 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountNewAction.java index 7c428a8c9..b6cd22d8f 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountNewAction.java @@ -30,18 +30,6 @@ public class AccountNewAction implements IAction { @JsonProperty private String accountType; - @Override - public Collection validate() { - List errors = new ArrayList<>(); - if (this.companyId == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "companyId")); - if (!StringUtils.hasLength(this.account)) - errors.add(new EnumMessage(BackEndError.ValidationError, "account")); - if (!StringUtils.hasLength(this.accountType)) - errors.add(new EnumMessage(BackEndError.ValidationError, "accountType")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } - @Override public AccountNewRequest toRequest() { var req = new AccountNewRequest(); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java index 9bbabc425..9bae6cd20 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java @@ -32,16 +32,6 @@ public class AccountUpdateAction implements IAction { @JsonProperty private String accountType; - @Override - public Collection validate() { - List errors = new ArrayList<>(); - if (this.id == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "id")); - if (!StringUtils.hasLength(this.accountType)) - errors.add(new EnumMessage(BackEndError.ValidationError, "accountType")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } - @Override public AccountUpdateRequest toRequest() { var req = new AccountUpdateRequest(); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java index a758e3e93..234cbd25c 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java @@ -51,31 +51,18 @@ public class BankAccountNewAction implements IAction { @Override public Collection validate() { List errors = new ArrayList<>(); - if (!StringUtils.hasLength(this.bankIdentificationCode)) - errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode")); - if (!StringUtils.hasLength(this.bankName)) - errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode")); if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccount)) { errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccount")); } if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccountName)) { errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccountName")); } - if (!StringUtils.hasLength(currency)) { - errors.add(new EnumMessage(BackEndError.ValidationError, "currency")); - } - if (!StringUtils.hasLength(destination)) { - errors.add(new EnumMessage(BackEndError.ValidationError, "destination")); - } if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxpayerIdentificationNumber)) { errors.add(new EnumMessage(BackEndError.ValidationError, "taxpayerIdentificationNumber")); } if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxRegistrationReasonCode)) { errors.add(new EnumMessage(BackEndError.ValidationError, "taxRegistrationReasonCode")); } - if (TextUtil.isEmpty(account)) { - errors.add(new EnumMessage(BackEndError.ValidationError, "account")); - } return errors.isEmpty() ? Collections.emptyList() : errors; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java index 326bfed47..f5073d567 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java @@ -42,11 +42,6 @@ public class BankAccountUpdateAction implements IAction validate() { - return Collections.emptyList(); - } - @Override public BankAccountUpdateRequest toRequest() { var req = new BankAccountUpdateRequest(); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeNewAction.java index ef0a6b1b1..527f1881f 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeNewAction.java @@ -35,16 +35,6 @@ public class ClientCodeNewAction implements IAction { @JsonProperty private String status; - @Override - public Collection validate() { - List errors = new ArrayList<>(); - if (this.companyId == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "companyId")); - if (!StringUtils.hasLength(this.code)) - errors.add(new EnumMessage(BackEndError.ValidationError, "code")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } - @Override public ClientCodeNewRequest toRequest() { var req = new ClientCodeNewRequest(); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeUpdateAction.java index 97f92a06e..d5ff04da8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeUpdateAction.java @@ -36,13 +36,6 @@ public class ClientCodeUpdateAction implements IAction @JsonProperty private String status; - @Override - public Collection validate() { - List errors = new ArrayList<>(); - if (this.id == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "id")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } @Override public ClientCodeUpdateRequest toRequest() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/payment/PIClearingOutbondActionNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/payment/PIClearingOutbondActionNew.java index 2c8559991..8f393e8d7 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/payment/PIClearingOutbondActionNew.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/payment/PIClearingOutbondActionNew.java @@ -36,16 +36,6 @@ public class PIClearingOutbondActionNew implements IAction validate() { - List errors = new ArrayList<>(); - if (this.senderId == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "senderId")); - if (this.addresseeId == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "addresseeId")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } - @Override public PIClearingOutbondActionNewRequest toRequest() { var req = new PIClearingOutbondActionNewRequest(); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/RSplitDepositActionNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/RSplitDepositActionNew.java index 1abe96c9f..9dc27ad99 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/RSplitDepositActionNew.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/RSplitDepositActionNew.java @@ -37,17 +37,6 @@ public class RSplitDepositActionNew implements IAction validate() { - List errors = new ArrayList<>(); - if (StringUtils.isEmpty(this.contract)) - errors.add(new EnumMessage(BackEndError.ValidationError, "contract")); - if (this.refundDate == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "refundDate")); - if (this.outboundAmount == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "outboundAmount")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } @Override public RegistrySplitDepositActionRequest toRequest() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryNewAction.java index dacbfd3ce..2e157edf8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryNewAction.java @@ -27,15 +27,6 @@ public class TradingClearingRegistryNewAction implements IAction validate() { - List errors = new ArrayList<>(); - if (this.companyId == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "companyId")); - if (this.moneyAccountId == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "moneyAccountId")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } @Override public TradingClearingRegistryNewRequest toRequest() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryUpdateAction.java index f7615a3ac..f10e0f4f8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryUpdateAction.java @@ -35,15 +35,6 @@ public class TradingClearingRegistryUpdateAction implements IAction validate() { - List errors = new ArrayList<>(); - if (this.id == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "id")); - if (StringUtils.isEmpty(this.status)) - errors.add(new EnumMessage(BackEndError.ValidationError, "status")); - return errors.isEmpty() ? Collections.emptyList() : errors; - } @Override public TradingClearingRegistryUpdateRequest toRequest() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java index 6d17ee7de..5ff82a9f9 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarNewAction.java @@ -46,18 +46,6 @@ public class ClearingCalendarNewAction implements IAction validate() { - List errors = new ArrayList<>(); - if (clearingDate == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate")); - } - if (TextUtil.isEmpty(dayStatus)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus")); - } - return errors; - } - public LocalDate getClearingDate() { return clearingDate; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarUpdateAction.java index b092b1bce..0f16bfb9e 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarUpdateAction.java @@ -52,21 +52,6 @@ public class ClearingCalendarUpdateAction implements IAction validate() { - List errors = new ArrayList<>(); - if (id == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"id")); - } - if (clearingDate == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate")); - } - if (TextUtil.isEmpty(dayStatus)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus")); - } - return errors; - } - @Override public Long getId() { return id; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java index 6867b0fca..6fcaa3836 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java @@ -78,23 +78,6 @@ public class PlannerNewAction implements IAction { return ActionType.NEW; } - @Override - public Collection validate() { - List errors = new ArrayList<>(); - if (TextUtil.isEmpty(task)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"task")); - } - if (taskTime == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime")); - } - if (clearingDate == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate")); - } - if (TextUtil.isEmpty(taskStatus)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus")); - } - return errors; - } public String getTask() { return task; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java index 3b8ce5635..debf99ebc 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java @@ -62,20 +62,6 @@ public class PlannerTemplateNewAction implements IAction validate() { - List errors = new ArrayList<>(); - if (TextUtil.isEmpty(task)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"task")); - } - if (taskTime == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime")); - } - if (TextUtil.isEmpty(taskStatus)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus")); - } - return errors; - } public String getTask() { return task; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateUpdateAction.java index 058258d7c..7fe3c1150 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateUpdateAction.java @@ -67,23 +67,6 @@ public class PlannerTemplateUpdateAction implements IAction validate() { - List errors = new ArrayList<>(); - if (id == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"id")); - } - if (TextUtil.isEmpty(task)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"task")); - } - if (taskTime == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime")); - } - if (TextUtil.isEmpty(taskStatus)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus")); - } - return errors; - } @Override public Long getId() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java index 66fa62fb4..f326d3a76 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java @@ -84,27 +84,6 @@ public class PlannerUpdateAction implements IAction, WithI return ActionType.UPDATE; } - @Override - public Collection validate() { - List errors = new ArrayList<>(); - if (id == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"id")); - } - if (TextUtil.isEmpty(task)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"task")); - } - if (taskTime == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime")); - } - if (clearingDate == null) { - errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate")); - } - if (TextUtil.isEmpty(taskStatus)) { - errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus")); - } - return errors; - } - @Override public Long getId() { return id; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityNewAction.java index eb062b3af..637b49405 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityNewAction.java @@ -51,20 +51,6 @@ public class EquitySecurityNewAction implements IAction validate() { - List errors = new ArrayList<>(); - if (TextUtil.isEmpty(shortName)) - errors.add(new EnumMessage(BackEndError.ValidationError, "shortName")); - if (TextUtil.isEmpty(securitySymbol)) - errors.add(new EnumMessage(BackEndError.ValidationError, "securitySymbol")); - if (lotSize == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "lotSize")); - if (TextUtil.isEmpty(instrumentType)) - errors.add(new EnumMessage(BackEndError.ValidationError, "instrumentType")); - return errors.size() > 0 ? errors : Collections.emptyList(); - } - @Override public EquitySecurityNewRequest toRequest() { var req = new EquitySecurityNewRequest(); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityUpdateAction.java index b60c07046..c94e266a4 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityUpdateAction.java @@ -53,13 +53,6 @@ public class EquitySecurityUpdateAction implements IAction validate() { - List errors = new ArrayList<>(); - if (id == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "id")); - return errors.size() > 0 ? errors : Collections.emptyList(); - } @Override public EquitySecurityUpdateRequest toRequest() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityNewAction.java index 0832d6846..efbdbb538 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityNewAction.java @@ -73,19 +73,6 @@ public class FixedIncomeSecurityNewAction implements IAction validate() { - List errors = new ArrayList<>(); - if (TextUtil.isEmpty(securitySymbol)) - errors.add(new EnumMessage(BackEndError.ValidationError, "securitySymbol")); - if (TextUtil.isEmpty(shortName)) - errors.add(new EnumMessage(BackEndError.ValidationError, "shortName")); - if (lotSize == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "lotSize")); - if (TextUtil.isEmpty(instrumentType)) - errors.add(new EnumMessage(BackEndError.ValidationError, "instrumentType")); - return errors.size() > 0 ? errors : Collections.emptyList(); - } @Override public FixedIncomeSecurityNewRequest toRequest() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityUpdateAction.java index 1ea013ee6..87734f1eb 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityUpdateAction.java @@ -75,14 +75,6 @@ public class FixedIncomeSecurityUpdateAction implements IAction validate() { - List errors = new ArrayList<>(); - if (id == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "id")); - return errors.size() > 0 ? errors : Collections.emptyList(); - } - @Override public FixedIncomeSecurityUpdateRequest toRequest() { var req = new FixedIncomeSecurityUpdateRequest(); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java index e8c258b59..b24ad5e04 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java @@ -74,29 +74,6 @@ public class MoneyMarketSecurityNewAction implements IAction validate() { - List errors = new ArrayList<>(); - if (TextUtil.isEmpty(securitySymbol)) - errors.add(new EnumMessage(BackEndError.ValidationError, "securitySymbol")); - if (TextUtil.isEmpty(shortName)) - errors.add(new EnumMessage(BackEndError.ValidationError, "shortName")); - if (this.lotSize == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "lotSize")); - if (this.nominalValue == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "nominalValue")); - if (TextUtil.isEmpty(nominalCurrency)) - errors.add(new EnumMessage(BackEndError.ValidationError, "nominalCurrency")); - if (this.startDate == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "startDate")); - if (this.endDate == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "endDate")); - if (this.termType == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "termType")); - if (TextUtil.isEmpty(instrumentType)) - errors.add(new EnumMessage(BackEndError.ValidationError, "instrumentType")); - return errors.size() > 0 ? errors : Collections.emptyList(); - } @Override public MoneyMarketSecurityNewRequest toRequest() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java index 1ac00a5eb..8ab36a8f4 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java @@ -99,14 +99,6 @@ public class MoneyMarketSecurityUpdateAction implements IAction validate() { - List errors = new ArrayList<>(); - if (this.id == null) - errors.add(new EnumMessage(BackEndError.ValidationError, "id")); - return errors.size() > 0 ? errors : Collections.emptyList(); - } - @ApiModelProperty(hidden = true) @Override public ActionType getActionType() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java index 1b6039679..6e2331892 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java @@ -107,7 +107,7 @@ public class ActionMetaValidation implements InitializingBean { @Override public String ruleName() { - return getClass().getSimpleName() + " of " + metaField.getClassName(); + return getClass().getSimpleName() + " of " + metaAction.getClassName(); } }