diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java index eea8a185e..122609131 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.account.errors; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum AccountError implements IEnumId { +public enum AccountError implements IErrorEnumId { WrongFieldValue(5004L), AccountAlreadyExist(5010L), CompanyNotFound(5013L), diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/errors/BackEndError.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/errors/BackEndError.java index 8508e0778..03bb9fcd0 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/errors/BackEndError.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/errors/BackEndError.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.backendapi.errors; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum BackEndError implements IEnumId { +public enum BackEndError implements IErrorEnumId { ValidationError(9000L), UnknownJsonProperty(9001L), FailedToReadHttpMessage(9002L), diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/errors/BalanceError.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/errors/BalanceError.java index 773623c19..e933afed2 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/errors/BalanceError.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/errors/BalanceError.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.balance.errors; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum BalanceError implements IEnumId { +public enum BalanceError implements IErrorEnumId { CompanyNotFound(5211L), CurrencyNotFound(5213L), CurrentDateOnly(5214L), diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingErrorInternal.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingErrorInternal.java index dfeee61f9..559837733 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingErrorInternal.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingErrorInternal.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.error; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum ClearingErrorInternal implements IEnumId { +public enum ClearingErrorInternal implements IErrorEnumId { ClearingNotAllowed(1L), AccountNotActive(2L), CompanyNotActive(3L), diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java index df682c6ea..a22834156 100644 --- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java +++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.validation.common.rules; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.time.LocalDate; @@ -16,8 +16,8 @@ import java.util.function.Function; public record DateNotBeforeRule( String fieldName, Function getter, - IEnumId errorEmptyRequiredValue, - IEnumId errorTaskForPastDate, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorTaskForPastDate, boolean required ) implements IValidationRule> { @@ -31,8 +31,8 @@ public record DateNotBeforeRule( */ public static DateNotBeforeRule instance(String fieldName, Function getter, - IEnumId errorEmptyRequiredValue, - IEnumId errorTaskForPastDate, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorTaskForPastDate, boolean required) { return new DateNotBeforeRule<>(fieldName, getter, errorEmptyRequiredValue, errorTaskForPastDate, required); } @@ -46,8 +46,8 @@ public record DateNotBeforeRule( */ public static DateNotBeforeRule instance(String fieldName, Function getter, - IEnumId errorEmptyRequiredValue, - IEnumId errorTaskForPastDate) { + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorTaskForPastDate) { return new DateNotBeforeRule<>(fieldName, getter, errorEmptyRequiredValue, errorTaskForPastDate, true); } diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java index ab42f8bc0..9cae88bc0 100644 --- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java +++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java @@ -6,7 +6,7 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Collection; @@ -22,8 +22,8 @@ public record DictionaryPresentRule(String fiel Function getter, String dictionaryName, Class dictionaryClass, - IEnumId errorEmptyRequiredValue, - IEnumId errorWrongDictionaryValue, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorWrongDictionaryValue, boolean required) implements IValidationRule> { /** @@ -41,8 +41,8 @@ public record DictionaryPresentRule(String fiel Function getter, String dictionaryName, Class dictionaryClass, - IEnumId errorEmptyRequiredValue, - IEnumId errorWrongDictionaryValue, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorWrongDictionaryValue, boolean required) { return new DictionaryPresentRule<>(fieldName, getter, @@ -67,8 +67,8 @@ public record DictionaryPresentRule(String fiel Function getter, String dictionaryName, Class dictionaryClass, - IEnumId errorEmptyRequiredValue, - IEnumId errorWrongDictionaryValue) { + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorWrongDictionaryValue) { return new DictionaryPresentRule<>(fieldName, getter, dictionaryName, diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java index 909dc97e8..169e5589f 100644 --- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java +++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.validation.common.rules; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.time.LocalDate; @@ -18,8 +18,8 @@ public record EndDtAfterStartDtRule( String startDtFieldName, Function getterEndDt, Function getterStartDt, - IEnumId errorEmptyRequiredValue, - IEnumId errorEndDtAfterStartDt, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorEndDtAfterStartDt, boolean required ) implements IValidationRule> { @@ -37,8 +37,8 @@ public record EndDtAfterStartDtRule( String startDtFieldName, Function getterEndDt, Function getterStartDt, - IEnumId errorEmptyRequiredValue, - IEnumId errorEndDtAfterStartDt, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorEndDtAfterStartDt, boolean required) { return new EndDtAfterStartDtRule<>(endDtFieldName, startDtFieldName, @@ -62,8 +62,8 @@ public record EndDtAfterStartDtRule( String startDtFieldName, Function getterEndDt, Function getterStartDt, - IEnumId errorEmptyRequiredValue, - IEnumId errorEndDtAfterStartDt) { + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorEndDtAfterStartDt) { return new EndDtAfterStartDtRule<>(endDtFieldName, startDtFieldName, getterEndDt, diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java index 13a3494ff..5b503aedf 100644 --- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java +++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java @@ -2,8 +2,8 @@ package ru.spcex.clearing.validation.common.rules; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; import ru.spcex.platform.utils.enumeration.IEnumKey; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Optional; @@ -18,8 +18,8 @@ public record EnumPresentRule(String fieldName, Function getter, E[] enumValues, boolean required, - IEnumId errorWrongEnumValue, - IEnumId errorEmptyRequiredValue) implements IValidationRule> { + IErrorEnumId errorWrongEnumValue, + IErrorEnumId errorEmptyRequiredValue) implements IValidationRule> { /** * @param fieldName Название поля @@ -35,8 +35,8 @@ public record EnumPresentRule(String fieldName, Function getter, E[] enumValues, boolean required, - IEnumId errorWrongEnumValue, - IEnumId errorEmptyRequiredValue) { + IErrorEnumId errorWrongEnumValue, + IErrorEnumId errorEmptyRequiredValue) { if (errorWrongEnumValue == null) throw new IllegalArgumentException("Empty errorWrongEnumValue"); if (required && errorEmptyRequiredValue == null) throw new IllegalArgumentException("Empty errorEmptyRequiredValue"); return new EnumPresentRule<>(fieldName, getter, enumValues, required, errorWrongEnumValue, errorEmptyRequiredValue); @@ -54,8 +54,8 @@ public record EnumPresentRule(String fieldName, public static EnumPresentRule instance(String fieldName, Function getter, E[] enumValues, - IEnumId errorWrongEnumValue, - IEnumId errorEmptyRequiredValue) { + IErrorEnumId errorWrongEnumValue, + IErrorEnumId errorEmptyRequiredValue) { return new EnumPresentRule<>(fieldName, getter, enumValues, true, errorWrongEnumValue, errorEmptyRequiredValue); } diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java index 2e215648e..370f0147d 100644 --- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java +++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java @@ -3,7 +3,7 @@ package ru.spcex.clearing.validation.common.rules; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Optional; @@ -18,7 +18,7 @@ import java.util.function.Function; public record FieldRequiredRule( String fieldName, Function getter, - IEnumId errorEmptyRequiredValue + IErrorEnumId errorEmptyRequiredValue ) implements IValidationRule> { /** @@ -28,7 +28,7 @@ public record FieldRequiredRule( * @param Класс проверяемого объекта * @param Класс проверяемого значения */ - public static FieldRequiredRule instance(String fieldName, Function getter, IEnumId errorEmptyRequiredValue) { + public static FieldRequiredRule instance(String fieldName, Function getter, IErrorEnumId errorEmptyRequiredValue) { if (errorEmptyRequiredValue == null) throw new IllegalArgumentException("Empty errorEmptyRequiredValue"); return new FieldRequiredRule<>(fieldName, getter, errorEmptyRequiredValue); } diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java index 5ce3c570f..1c6abcfaf 100644 --- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java +++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java @@ -4,7 +4,7 @@ import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Optional; @@ -20,10 +20,10 @@ public record IdPresentRule( Function idGetter, String mapName, Class mapClass, - IEnumId errorEmptyRequiredValue, - IEnumId errorIdNotPresent, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorIdNotPresent, boolean required, - Function[] additionalChecks + Function[] additionalChecks ) implements IValidationRule> { /** @@ -43,10 +43,10 @@ public record IdPresentRule( Function idGetter, String mapName, Class mapClass, - IEnumId errorEmptyRequiredValue, - IEnumId errorIdNotPresent, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorIdNotPresent, boolean required, - Function ... additionalChecks) { + Function ... additionalChecks) { return new IdPresentRule<>(fieldName, idGetter, mapName, @@ -73,9 +73,9 @@ public record IdPresentRule( Function idGetter, String mapName, Class mapClass, - IEnumId errorEmptyRequiredValue, - IEnumId errorIdNotPresent, - Function ... additionalChecks) { + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorIdNotPresent, + Function ... additionalChecks) { return new IdPresentRule<>(fieldName, idGetter, mapName, @@ -96,8 +96,8 @@ public record IdPresentRule( if (fromMap == null) { return of(errorIdNotPresent, fieldName); } - for (Function additionalCheck : additionalChecks) { - IEnumId validationError = additionalCheck.apply(fromMap); + for (Function additionalCheck : additionalChecks) { + IErrorEnumId validationError = additionalCheck.apply(fromMap); if (validationError != null) return of(validationError, fieldName); } diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java index 3386c66cf..7ab42a96c 100644 --- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java +++ b/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.validation.common.rules; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.time.LocalTime; @@ -16,8 +16,8 @@ import java.util.function.Function; public record TimeNotBeforeRule( String fieldName, Function getter, - IEnumId errorEmptyRequiredValue, - IEnumId errorTaskForPastTime, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorTaskForPastTime, boolean required ) implements IValidationRule> { @@ -31,8 +31,8 @@ public record TimeNotBeforeRule( */ public static TimeNotBeforeRule instance(String fieldName, Function getter, - IEnumId errorEmptyRequiredValue, - IEnumId errorTaskForPastTime, + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorTaskForPastTime, boolean required) { return new TimeNotBeforeRule<>(fieldName, getter, errorEmptyRequiredValue, errorTaskForPastTime, required); } @@ -46,8 +46,8 @@ public record TimeNotBeforeRule( */ public static TimeNotBeforeRule instance(String fieldName, Function getter, - IEnumId errorEmptyRequiredValue, - IEnumId errorTaskForPastTime) { + IErrorEnumId errorEmptyRequiredValue, + IErrorEnumId errorTaskForPastTime) { return new TimeNotBeforeRule<>(fieldName, getter, errorEmptyRequiredValue, errorTaskForPastTime, true); } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java index ca3edbd16..dea10bcdc 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.company.error; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum CompanyErrors implements IEnumId { +public enum CompanyErrors implements IErrorEnumId { GeneralError(3000L), // Общая ошибка модуля company-service UserVerifyDenial(3001L), // 'Нет прав на проведение данной операции diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/error/ValidationError.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/error/ValidationError.java index ea04bfa3a..678f62c27 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/error/ValidationError.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/error/ValidationError.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.scheduler.error; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum ValidationError implements IEnumId { +public enum ValidationError implements IErrorEnumId { WrongDictionaryValue(10003L), EmptyRequiredValue(10002L), WrongEnumValue(777L), //todo set code diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java index f43b0868e..0981c30ff 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.securities.errors; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum SecuritiesError implements IEnumId { +public enum SecuritiesError implements IErrorEnumId { RequiredFieldIsEmpty(1002L), WrongFieldValue(1004L), InstrumentAlreadyExists(1010L), diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeById.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeById.java index 21b30f3af..0c55dc5f0 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeById.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeById.java @@ -5,16 +5,16 @@ import ru.spcex.platform.classes.base.interfaces.WithInstrumentType; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.imdg.validation.Stored; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Optional; public class IsValidInstrumentTypeById implements IValidationRule> { - private final IEnumId errorEnum; + private final IErrorEnumId errorEnum; private final String predictableInstrumentType; - public IsValidInstrumentTypeById(IEnumId errorEnum, String predictableInstrumentType) { + public IsValidInstrumentTypeById(IErrorEnumId errorEnum, String predictableInstrumentType) { this.errorEnum = errorEnum; this.predictableInstrumentType = predictableInstrumentType; } diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeFromRequest.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeFromRequest.java index 68b8bb857..a051e0916 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeFromRequest.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/IsValidInstrumentTypeFromRequest.java @@ -4,16 +4,16 @@ import ru.spcex.clearing.securities.errors.SecuritiesError; import ru.spcex.platform.classes.base.interfaces.WithInstrumentType; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Optional; public class IsValidInstrumentTypeFromRequest implements IValidationRule> { - private final IEnumId errorEnum; + private final IErrorEnumId errorEnum; private final String predictableInstrumentType; - public IsValidInstrumentTypeFromRequest(IEnumId errorEnum, String predictableInstrumentType) { + public IsValidInstrumentTypeFromRequest(IErrorEnumId errorEnum, String predictableInstrumentType) { this.errorEnum = errorEnum; this.predictableInstrumentType = predictableInstrumentType; } diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/NotPresentBySecuritySymbolAndWorkflowStatusActv.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/NotPresentBySecuritySymbolAndWorkflowStatusActv.java index c8ff2f025..a65516a81 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/NotPresentBySecuritySymbolAndWorkflowStatusActv.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/NotPresentBySecuritySymbolAndWorkflowStatusActv.java @@ -8,7 +8,7 @@ import ru.spcex.platform.enumeration.Status; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Map; @@ -16,10 +16,10 @@ import java.util.Optional; public class NotPresentBySecuritySymbolAndWorkflowStatusActv implements IValidationRule> { private final String mapName; - private final IEnumId errorEnum; + private final IErrorEnumId errorEnum; private final Class clazz; - public NotPresentBySecuritySymbolAndWorkflowStatusActv(String mapName, IEnumId errorEnum, Class clazz) { + public NotPresentBySecuritySymbolAndWorkflowStatusActv(String mapName, IErrorEnumId errorEnum, Class clazz) { this.mapName = mapName; this.errorEnum = errorEnum; this.clazz = clazz; diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/validation/rule/PresentById.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/validation/rule/PresentById.java index 824f0acea..1da49900d 100644 --- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/validation/rule/PresentById.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/validation/rule/PresentById.java @@ -5,21 +5,21 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.imdg.validation.Stored; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.validation.IValidationRule; import java.util.Optional; public class PresentById implements IValidationRule> { private final String mapName; - private final IEnumId errorEnum; + private final IErrorEnumId errorEnum; private boolean storeEnabled = false; - public PresentById(String mapName, IEnumId errorEnum) { + public PresentById(String mapName, IErrorEnumId errorEnum) { this.mapName = mapName; this.errorEnum = errorEnum; } - public PresentById(String mapName, IEnumId errorEnum, Boolean storeEnabled) { + public PresentById(String mapName, IErrorEnumId errorEnum, Boolean storeEnabled) { this.mapName = mapName; this.errorEnum = errorEnum; this.storeEnabled = storeEnabled; diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IErrorEnumId.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IErrorEnumId.java new file mode 100644 index 000000000..e527b2645 --- /dev/null +++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IErrorEnumId.java @@ -0,0 +1,5 @@ +package ru.spcex.platform.utils.enumeration; + + +public interface IErrorEnumId extends IEnumId { +} diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/validation/IValidationRule.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/validation/IValidationRule.java index 3ad88a3f1..d5a3f8be7 100644 --- a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/validation/IValidationRule.java +++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/validation/IValidationRule.java @@ -1,7 +1,7 @@ package ru.spcex.platform.utils.validation; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; import java.util.Optional; @@ -29,11 +29,11 @@ public interface IValidationRule { } //*************** методы для сокращения кода *************** - default Optional of(IEnumId error) { + default Optional of(IErrorEnumId error) { return Optional.of(new EnumMessage(error)); } - default Optional of(IEnumId error, Object... args) { + default Optional of(IErrorEnumId error, Object... args) { return Optional.of(new EnumMessage(error, args)); } diff --git a/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/validation/TestEnumWithId.java b/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/validation/TestEnumWithId.java index f357d0c12..de4291d02 100644 --- a/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/validation/TestEnumWithId.java +++ b/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/validation/TestEnumWithId.java @@ -1,8 +1,9 @@ package ru.spcex.platform.utils.validation; import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum TestEnumWithId implements IEnumId { +public enum TestEnumWithId implements IEnumId, IErrorEnumId { Message1(1L), Message2(2L), Message3(3L),