From 5639f9ff8bf8a12cc984abaf18f10f9378b8065c Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Wed, 22 Nov 2023 15:19:41 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-596 fix after review

---
 .../reports/builders/ks/KSRepCashNettoReportBuilder.java | 8 ++++----
 .../builders/ks/KSRepCashRegisterSumsReportBuilder.java  | 2 +-
 .../reports/builders/ks/KSRepDepoNettoReportBuilder.java | 9 +++------
 .../reports/builders/ks/KSRepTradesReportBuilder.java    | 2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
index 2d7219ba7..e45532acc 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
@@ -124,24 +124,24 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                         sourceTkr = next.getTradingClearingRegistry();
                     }
                     for (Registry currRegistry : cmtRegistries) {
-                        if (!sourceTradingCode.equals(currRegistry.getTradingCode())) {
+                        if (!Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) {
                             invalid = true;
                             log.warn("Invalid CM_T registries set, tradingCode not equals. Registries was skipped");
                             break;
                         }
-                        if (!sourceTkr.equals(currRegistry.getTradingClearingRegistry())) {
+                        if (!Objects.equals(sourceTkr, currRegistry.getTradingClearingRegistry())) {
                             invalid = true;
                             log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped");
                             break;
                         }
                     }
                     for (Registry currRegistry : lmtRegistries) {
-                        if (!sourceTradingCode.equals(currRegistry.getTradingCode())) {
+                        if (!Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) {
                             invalid = true;
                             log.warn("Invalid LM_T registries set, tradingCode not equals. Registries was skipped");
                             break;
                         }
-                        if (!sourceTkr.equals(currRegistry.getTradingClearingRegistry())) {
+                        if (!Objects.equals(sourceTkr, currRegistry.getTradingClearingRegistry())) {
                             invalid = true;
                             log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped");
                             break;
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java
index 4598002e9..2d4587ae8 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java
@@ -110,7 +110,7 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
                         pairRegistry.getId());
             }
 
-            String account = "";
+            String account = null;
             AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registry.getAccountType());
             if (accountType == AccountType.Clrn) {
                 account = registry.getAccount();
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java
index 7181d0925..0b5570f3b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java
@@ -20,10 +20,7 @@ import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
@@ -113,13 +110,13 @@ public class KSRepDepoNettoReportBuilder extends CSVReportBuilder<SessionIdParam
                     if (!cstRegistries.isEmpty()) sourceTradingCode = cstRegistries.iterator().next().getTradingCode();
                     if (!lstRegistries.isEmpty()) sourceTradingCode = lstRegistries.iterator().next().getTradingCode();
                     for (Registry currRegistry : cstRegistries) {
-                        if (sourceTradingCode.equals(currRegistry.getTradingCode())) continue;
+                        if (Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) continue;
                         invalid = true;
                         log.warn("Invalid CS_T registries set, tradingCode not equals. Registries was skipped");
                         break;
                     }
                     for (Registry currRegistry : lstRegistries) {
-                        if (sourceTradingCode.equals(currRegistry.getTradingCode())) continue;
+                        if (Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) continue;
                         invalid = true;
                         log.warn("Invalid LS_T registries set, tradingCode not equals. Registries was skipped");
                         break;
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
index deb9a2ff0..207d8fc0b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
@@ -156,7 +156,7 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
 
                 ksRepTradesReport.setTkr(tkr.getCode());
 
-                String account = "";
+                String account = null;
                 if (tkr.getMoneyAccountId() != null) {
                     Account moneyAccountFromImdg = accountImdg.getSingleObjectByID(tkr.getMoneyAccountId());
                     if (moneyAccountFromImdg != null) {