From 7b422acc4a104b7b7a8fa2103cf36490afda752c Mon Sep 17 00:00:00 2001
From: etreschenkov <etreschenkov@mfd.ru>
Date: Wed, 11 Oct 2023 21:44:02 +0300
Subject: [PATCH] add history mapstores

---
 clearing-parent/imdg-hist/pom.xml             |  7 ++--
 .../config/HistoryPoolMapConfigs.java         |  8 ++---
 clearing-parent/imdg/pom.xml                  |  1 +
 .../clearing/imdg/base/AutoconfiguredMap.java | 34 +++++++++----------
 .../imdg/base/AutoconfiguredMap1.java         | 17 ----------
 5 files changed, 26 insertions(+), 41 deletions(-)
 delete mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap1.java

diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml
index b97f12c19..1653d470a 100644
--- a/clearing-parent/imdg-hist/pom.xml
+++ b/clearing-parent/imdg-hist/pom.xml
@@ -3,14 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>imdg-hist</artifactId>
+    <packaging>jar</packaging>
+    <version>SPCEX-1.0.0.0</version>
+
     <parent>
         <artifactId>clearing-parent</artifactId>
         <groupId>ru.spcex.clearing</groupId>
         <version>SPCEX-1.0.0.0</version>
     </parent>
 
-    <artifactId>imdg-hist</artifactId>
-    <packaging>jar</packaging>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -30,7 +32,6 @@
         <dependency>
             <groupId>ru.spcex.clearing</groupId>
             <artifactId>imdg</artifactId>
-            <version>SPCEX-1.0.0.0</version>
         </dependency>
         <dependency>
             <groupId>ru.spcex.clearing</groupId>
diff --git a/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/config/HistoryPoolMapConfigs.java b/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/config/HistoryPoolMapConfigs.java
index dcd4012b0..ee8f1a414 100644
--- a/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/config/HistoryPoolMapConfigs.java
+++ b/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/config/HistoryPoolMapConfigs.java
@@ -7,7 +7,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import ru.spcex.clearing.imdg.base.AutoconfiguredMap1;
+import ru.spcex.clearing.imdg.base.AutoconfiguredMap;
 import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
 
 import java.util.ArrayList;
@@ -20,10 +20,10 @@ public class HistoryPoolMapConfigs {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
 
-    private final List<AutoconfiguredMap1<?>> autoconfiguredMaps;
+    private final List<AutoconfiguredMap<?>> autoconfiguredMaps;
 
     @Autowired
-    public HistoryPoolMapConfigs(List<AutoconfiguredMap1<?>> autoconfiguredMaps) {
+    public HistoryPoolMapConfigs(List<AutoconfiguredMap<?>> autoconfiguredMaps) {
         this.autoconfiguredMaps = autoconfiguredMaps;
     }
 
@@ -60,7 +60,7 @@ public class HistoryPoolMapConfigs {
     public List<MapConfig> configureEachMapStore() {
         List<MapConfig> out = new ArrayList<>();
         HashSet<String> existMapStores = new HashSet<>();
-        for (AutoconfiguredMap1<?> mapStore : autoconfiguredMaps) {
+        for (AutoconfiguredMap<?> mapStore : autoconfiguredMaps) {
             try {
                 log.debug("Link mapstore {} to map {}", mapStore.toString(), mapStore.getMapName());
                 if (StringUtils.isEmpty(mapStore.getMapName())) {
diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml
index 24a1cef03..609a45138 100644
--- a/clearing-parent/imdg/pom.xml
+++ b/clearing-parent/imdg/pom.xml
@@ -143,6 +143,7 @@
                 </executions>
                 <configuration>
                     <addResources>true</addResources>
+                    <classifier>exec</classifier>
                     <finalName>${project.artifactId}</finalName>
                 </configuration>
             </plugin>
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java
index d3d1b44ff..0807f6c19 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java
@@ -1,17 +1,17 @@
-package ru.spcex.clearing.imdg.base;
-
-import com.hazelcast.core.MapLoader;
-
-public interface AutoconfiguredMap<T> extends MapLoader<Long, T> {
-    /**
-     *
-     * @return IMDGDistributedNames.*
-     */
-    String getMapName();
-
-    /**
-     * Список индексируемых полей, для быстрого поиска
-     * @return
-     */
-    String[] getIndexingField();
-}
+package ru.spcex.clearing.imdg.base;
+
+import com.hazelcast.core.MapLoader;
+
+public interface AutoconfiguredMap<T> extends MapLoader<Long, T> {
+    /**
+     *
+     * @return IMDGDistributedNames.*
+     */
+    String getMapName();
+
+    /**
+     * Список индексируемых полей, для быстрого поиска
+     * @return
+     */
+    String[] getIndexingField();
+}
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap1.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap1.java
deleted file mode 100644
index 367e5450d..000000000
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap1.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.spcex.clearing.imdg.base;
-
-import com.hazelcast.core.MapLoader;
-
-public interface AutoconfiguredMap1<T> extends MapLoader<Long, T> {
-    /**
-     *
-     * @return IMDGDistributedNames.*
-     */
-    String getMapName();
-
-    /**
-     * Список индексируемых полей, для быстрого поиска
-     * @return
-     */
-    String[] getIndexingField();
-}