From d78105c3b772846fcf8396a70510ebb57ffab687 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Mon, 2 Oct 2023 20:38:54 +0300
Subject: [PATCH] =?UTF-8?q?test-api-clearing=20issues/31=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B5=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D1=82=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=BE=D0=B4?=
 =?UTF-8?q?=D1=83=D0=BB=D1=8F=20=D0=BA=20hazelcast=20=D0=BA=D0=B0=D0=BA=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0=20(=D0=B1=D1=8B?=
 =?UTF-8?q?=D0=BB=D0=B8=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F),=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 clearing-parent/test-api-clearing/pom.xml     | 42 +++++++---------
 .../ru/spcex/clearing/test/ImdgService.java   | 50 ++++++++++++-------
 .../ru/spcex/clearing/test/KafkaService.java  |  5 +-
 .../clearing/test/config/KafkaConfig.java     | 14 +++++-
 .../controller/HttpServerSimpleFramework.java |  1 -
 5 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/clearing-parent/test-api-clearing/pom.xml b/clearing-parent/test-api-clearing/pom.xml
index 7444c7297..37e2fcdc0 100644
--- a/clearing-parent/test-api-clearing/pom.xml
+++ b/clearing-parent/test-api-clearing/pom.xml
@@ -68,6 +68,11 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>ru.spcex.clearing</groupId>-->
 <!--            <artifactId>test-clearing</artifactId>-->
@@ -96,18 +101,6 @@
             <groupId>ru.spcex.platform</groupId>
             <artifactId>platform-imdg-api-hazelcast-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ru.spcex.platform</groupId>
-            <artifactId>platform-messaging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -116,19 +109,18 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
-
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-web</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.springfox</groupId>-->
+<!--            <artifactId>springfox-swagger2</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.springfox</groupId>-->
+<!--            <artifactId>springfox-swagger-ui</artifactId>-->
+<!--        </dependency>-->
         <!--<dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-spring-boot-starter</artifactId>
diff --git a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/ImdgService.java b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/ImdgService.java
index 2b284dafd..dd9adae43 100644
--- a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/ImdgService.java
+++ b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/ImdgService.java
@@ -1,13 +1,16 @@
 package ru.spcex.clearing.test;
 
 import com.hazelcast.config.MapStoreConfig;
+import com.hazelcast.core.DistributedObject;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import ru.clearing.classes.objects.BusinessObject;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.platform.imdg.iml.hazelcast.util.HazelcastHelper;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,6 +24,11 @@ public class ImdgService {
 
     HazelcastInstance hazelcastServerInstance;
 
+    @Autowired
+    public ImdgService(HazelcastInstance hazelcastServerInstance) {
+        this.hazelcastServerInstance = hazelcastServerInstance;
+    }
+
     Collection<String> allMaps() {
         return null;
     }
@@ -32,23 +40,37 @@ public class ImdgService {
 
         HashSet<String> ignoreUpdateMap = new HashSet<>(); // Эти мапы не должны обновляться
         ignoreUpdateMap.add(IMDGDistributedNames.Map_RequestInfo);
+        ignoreUpdateMap.add(HazelcastHelper.CLEARING_SYSTEM_MAP);
+        ignoreUpdateMap.add(HazelcastHelper.STATE_OF_IMDG_SERVER);
+
+        // no mapstore:
+        ignoreUpdateMap.add(IMDGDistributedNames.Map_LiabilitiesClaimsAssets);
+        ignoreUpdateMap.add(IMDGDistributedNames.Map_AccountBalance);
+        ignoreUpdateMap.add(IMDGDistributedNames.Map_KeyRate);
+        ignoreUpdateMap.add(IMDGDistributedNames.Map_LiabilitiesClaimsMoney);
 
         try {
             List<Callable<Long>> tasks = new ArrayList<>();
-            Collection<String> mapNames = hazelcastServerInstance.getConfig().getMapConfigs().keySet();
+            // На сервере так: Collection<String> mapNames = hazelcastServerInstance.getConfig().getMapConfigs().keySet();
+            // На клиенте:
+            List<String> mapNames = new ArrayList<>();
+            for (DistributedObject object : hazelcastServerInstance.getDistributedObjects()) {
+                if (object instanceof IMap) // MapProxyImpl
+                    mapNames.add(((IMap) object).getName());
+            }
             for (String mapName : mapNames) {
                 if (ignoreUpdateMap.contains(mapName)) {
-                    log.info("Ignore sync for map {}", mapName);
+                    log.debug("Ignore sync for map {}", mapName);
                     continue;
                 }
                 tasks.add(() -> {
                     Long maxKey = null;
-                    MapStoreConfig mapStoreConfig = hazelcastServerInstance.getConfig().getMapConfig(mapName).getMapStoreConfig();
-                    if (mapStoreConfig != null && mapStoreConfig.isEnabled()) {
+//                    MapStoreConfig mapStoreConfig = hazelcastServerInstance.getConfig().getMapConfig(mapName).getMapStoreConfig();
+//                    if (mapStoreConfig != null && mapStoreConfig.isEnabled()) {
+                    try {
                         long start = System.currentTimeMillis();
                         log.debug("evict map {}", mapName);
                         IMap<Long, BusinessObject> map = hazelcastServerInstance.getMap(mapName);
-//       todo проверить что ничего лишнего не попадет
                         int size1 = map.size();
                         map.evictAll();
                         log.debug("Load map {}", mapName);
@@ -59,22 +81,12 @@ public class ImdgService {
                         if (size1 != size)
                             log.warn("Map {} change size from {} to {}", mapName, size1, size);
 
-                        Object mapStore = mapStoreConfig.getImplementation();
-                        //todo проверить реализацию.
                         maxKey = map.keySet().stream().max(Long::compareTo).orElse(null);
-//                        if (mapStore instanceof SimpleObjectMapStore) {
-//                            String tableName = ((SimpleObjectMapStore) mapStore).getTableName();
-//                            maxKey = map.keySet().stream().max(Long::compareTo).orElse(null); // jdbcTemplate.queryForObject("select max(id) from " + tableName, Long.class);
-//                        } else if (mapStore instanceof DictionaryMapStore) {
-//                            // для Dictionary не используется общий id генератор
-////                        } else if (mapStore instanceof FrontendUserSessionMapStore) {
-////                            // не используется общий id генератор
-//                        } else {
-//                            throw new RuntimeException("unknown map store implementation " + mapStore);
-//                        }
-                        log.debug("{} max(id)={}", mapName, maxKey);
-                    }
 
+                        log.trace("{} max(id)={}", mapName, maxKey);
+                    } catch (RuntimeException e) {
+                        throw new RuntimeException("Can not reload map " + mapName, e);
+                    }
                     return maxKey;
                 });
             }
diff --git a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/KafkaService.java b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/KafkaService.java
index dbd6f971e..089c9c024 100644
--- a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/KafkaService.java
+++ b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/KafkaService.java
@@ -19,7 +19,7 @@ public class KafkaService {
     protected final Logger log = LoggerFactory.getLogger(getClass());
     private final KafkaSender kafkaSender;
 
-    @Autowired
+    @Autowired(required = false)
     public KafkaService(KafkaSender kafkaSender) {
         this.kafkaSender = kafkaSender;
     }
@@ -29,6 +29,9 @@ public class KafkaService {
     }
 
     public Long putMessage(String fullClassName, String topic, String jsonBody) throws ClassNotFoundException, JsonProcessingException {
+        if (kafkaSender == null) {
+            throw new IllegalStateException("Kafka action disabled");
+        }
         log.info("Call test method for kafka, class=\"{}\"; topic=\"{}\"; message=\"{}\"", fullClassName, topic, jsonBody);
         if (StringUtils.isEmpty(fullClassName)) throw new IllegalArgumentException("Class was emppty");
         if (StringUtils.isEmpty(topic)) throw new IllegalArgumentException("Topic was emppty");
diff --git a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/config/KafkaConfig.java b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/config/KafkaConfig.java
index 643c3694a..953b8ecf0 100644
--- a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/config/KafkaConfig.java
+++ b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/config/KafkaConfig.java
@@ -3,6 +3,8 @@ package ru.spcex.clearing.test.config;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
 import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -24,6 +26,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
 
 @Configuration
 public class KafkaConfig {
+    Logger log = LoggerFactory.getLogger(getClass());
 //    @Autowired
 //    @Bean
 //    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@@ -42,20 +45,29 @@ public class KafkaConfig {
     @Bean
     public ProducerFactory<String, Object> pf(TestServiceSettings settings) {
         KafkaProducerSettings kafkaSettings = settings.getKafkaProducer();
+        if (kafkaSettings == null) {
+            log.warn("Kafka config not set - disable kafca function");
+            return null;
+        }
         return KafkaProducerFactory.producerFactory(kafkaSettings);
 //        return Mockito.mock(ProducerFactory.class);
     }
 
+    @Autowired(required = false)
     @Bean("kafkaTemplate")
     public KafkaTemplate<String, Object> kafkaTemplate(ProducerFactory<String, Object> pf) {
+        if (pf == null) return null;
         return new KafkaTemplate<>(pf);
     }
 
-    @Autowired
+    @Autowired(required = false)
     @Bean
     public KafkaSender kafkaSender(@Qualifier("kafkaTemplate") KafkaTemplate<String, Object> kafkaTemplate,
                                    ImdgProvider imdgProvider
     ) {
+        if (kafkaTemplate == null) {
+            return null;
+        }
         ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
         return KafkaSender
                 .setup()
diff --git a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/controller/HttpServerSimpleFramework.java b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/controller/HttpServerSimpleFramework.java
index bd7401817..f1538590c 100644
--- a/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/controller/HttpServerSimpleFramework.java
+++ b/clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/controller/HttpServerSimpleFramework.java
@@ -43,7 +43,6 @@ public abstract class HttpServerSimpleFramework implements InitializingBean, Dis
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        Integer port = null; // 8080
         try {
             log.info("Server star at port {} with url \"{}\"", port, baseUrl);
             this.server = HttpServer.create(new InetSocketAddress(port), 0);