From f98e58a2bd87c9e18d4099322e6fff502eb5b0d4 Mon Sep 17 00:00:00 2001
From: psemenkov <psemenkov@mfd.ru>
Date: Wed, 21 Sep 2022 15:33:05 +0300
Subject: [PATCH] http://git.mfd.msk/mfd/clearing/issues/6 --- fixing generate
 java doc for app

---
 .../clearing/imdg/base/TemplateMapStore.java  |  5 +++--
 .../platform/utils/enumeration/IEnumId.java   | 14 +++++++-------
 pom.xml                                       | 19 +++++++++++++++----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java
index dd47bd4fe..de4d5204b 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java
@@ -9,7 +9,6 @@ import java.util.*;
 
 /**
  * MapStore для шаблонных бизнес-объектов
- * @Component
  */
 public abstract class TemplateMapStore<T extends SpcexObjectBase> extends ObjectBaseMapStore<T> implements AutoconfiguredMap<T> {
 
@@ -22,13 +21,13 @@ public abstract class TemplateMapStore<T extends SpcexObjectBase> extends Object
     }
 
     /**
-     *
      * @return IMDGDistributedNames.*
      */
     public abstract String getMapName();
 
     /**
      * Список индексируемых полей, для быстрого поиска
+     *
      * @return
      */
     public String[] getIndexingField() {
@@ -37,6 +36,7 @@ public abstract class TemplateMapStore<T extends SpcexObjectBase> extends Object
 
     /**
      * Десериализатор
+     *
      * @param resultSet
      * @return
      */
@@ -51,6 +51,7 @@ public abstract class TemplateMapStore<T extends SpcexObjectBase> extends Object
 
     /**
      * Сериализатор
+     *
      * @param resultSet
      * @return Object[] args
      */
diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumId.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumId.java
index a45b3c628..10859b6a4 100644
--- a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumId.java
+++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumId.java
@@ -4,11 +4,7 @@ import java.io.Serializable;
 import java.util.Objects;
 
 public interface IEnumId extends Serializable {
-    Long getId();
-
-    default boolean equalsById(Long id) {
-        return id != null && getId().equals(id);
-    }
+    Long UNDEFINED_VALUE = Long.MIN_VALUE;
 
     /**
      * Проверяет что среди данного набора Enum, присутствует элемент с данным id
@@ -46,7 +42,7 @@ public interface IEnumId extends Serializable {
      * Возвращает Enum по id, если в заданном классе такой определен
      * id может быть null
      *
-     * @return Enum если нашел, иначе <tt>null</tt>
+     * @return Enum если нашел, иначе null
      */
     static <T extends Enum<T> & IEnumId> T getEnumById(Class<T> enumClass, Long id) {
         for (T e : enumClass.getEnumConstants()) {
@@ -60,5 +56,9 @@ public interface IEnumId extends Serializable {
         return enumVal == null ? null : enumVal.getId();
     }
 
-    Long UNDEFINED_VALUE = Long.MIN_VALUE;
+    Long getId();
+
+    default boolean equalsById(Long id) {
+        return id != null && getId().equals(id);
+    }
 }
diff --git a/pom.xml b/pom.xml
index a70f4b92f..07514166d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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>
 
@@ -30,8 +30,10 @@
 
         <!--suppress UnresolvedMavenProperty -->
         <folder_root_clearing>${folder_root_clearing_temp}</folder_root_clearing>
-        <folder_root_clearing_backend-api>${folder_root_clearing}/clearing-parent/backend-api</folder_root_clearing_backend-api>
-        <folder_root_clearing_securities-service>${folder_root_clearing}/clearing-parent/securities-service</folder_root_clearing_securities-service>
+        <folder_root_clearing_backend-api>${folder_root_clearing}/clearing-parent/backend-api
+        </folder_root_clearing_backend-api>
+        <folder_root_clearing_securities-service>${folder_root_clearing}/clearing-parent/securities-service
+        </folder_root_clearing_securities-service>
         <folder_root_clearing_imdg>${folder_root_clearing}/clearing-parent/imdg</folder_root_clearing_imdg>
         <folder_root_dbf-exporter>${folder_root_clearing}/clearing-parent/dbf-exporter</folder_root_dbf-exporter>
         <folder_root_dbf-importer>${folder_root_clearing}/clearing-parent/dbf-importer</folder_root_dbf-importer>
@@ -285,6 +287,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <show>private</show>
+                    <nohelp>true</nohelp>
+                    <!--                    <excludePackageNames>ru.spcex.platform.utils.*:ru.spcex.clearing.imdg.*</excludePackageNames>-->
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file