From 2e90eb7ca2d687a3ad779f47756588cd0661b1fc Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 24 May 2023 11:49:25 +0300 Subject: [PATCH] some refactoring --- .../clearing/models/RegistryTradingParams.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/models/RegistryTradingParams.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/models/RegistryTradingParams.java index ce5760087..c831039e6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/models/RegistryTradingParams.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/models/RegistryTradingParams.java @@ -1,22 +1,21 @@ package ru.spcex.clearing.models; -import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.platform.enumeration.RegistryCapacity; import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.enumeration.RegistryInstrumentType; import ru.spcex.platform.enumeration.RegistryUnit; -import ru.spcex.platform.utils.enumeration.IEnumKey; public record RegistryTradingParams(RegistryDesignation registryDesignation, RegistryInstrumentType registryInstrumentType, RegistryCapacity registryCapacity, RegistryUnit registryUnit) { - public boolean equalByRegistry(Registry registry) { - boolean isEqualDesignation = this.registryDesignation == null || IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()) == this.registryDesignation; - boolean isEqualInstrumentType = this.registryInstrumentType == null || IEnumKey.getEnumByKey(RegistryInstrumentType.class, registry.getRegistryInstrumentType()) == this.registryInstrumentType; - boolean isEqualCapacity = this.registryCapacity == null || IEnumKey.getEnumByKey(RegistryCapacity.class, registry.getRegistryCapacity()) == this.registryCapacity; - boolean isEqualUnit = this.registryUnit == null || IEnumKey.getEnumByKey(RegistryUnit.class, registry.getRegistryUnit()) == this.registryUnit; + public boolean equalByRegistry(RegistryDesignation registryDesignation, RegistryInstrumentType registryInstrumentType, + RegistryCapacity registryCapacity, RegistryUnit registryUnit) { + boolean isEqualDesignation = this.registryDesignation == null || registryDesignation == this.registryDesignation; + boolean isEqualInstrumentType = this.registryInstrumentType == null || registryInstrumentType == this.registryInstrumentType; + boolean isEqualCapacity = this.registryCapacity == null || registryCapacity == this.registryCapacity; + boolean isEqualUnit = this.registryUnit == null || registryUnit == this.registryUnit; return isEqualDesignation && isEqualInstrumentType && isEqualCapacity && isEqualUnit; }