From c4c12ccad77aab95985caa796880c294ab50ec77 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 7 Jul 2023 20:55:37 +0300
Subject: [PATCH] =?UTF-8?q?meta=20xsl=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B0=D0=B2=D1=82=D0=BE-=D0=B3=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20extends?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/meta/xsl/ddl.xsl       |  8 ++--
 .../src/main/resources/meta/xsl/java.xsl      | 41 +++++++++----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/resources/meta/xsl/ddl.xsl b/clearing-parent/backend-api/src/main/resources/meta/xsl/ddl.xsl
index cae231f66..163c1ec0c 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/xsl/ddl.xsl
+++ b/clearing-parent/backend-api/src/main/resources/meta/xsl/ddl.xsl
@@ -73,12 +73,12 @@ COMMENT ON COLUMN <xsl:value-of select="$dbTableName"/>_HISTORY.EVENT_TYPE IS '
 <xsl:variable name="tp" select="@type"/>
 <xsl:choose>
 <xsl:when test="@dbfield"><xsl:value-of select="@dbfield"/></xsl:when>
-<xsl:when test="@linkKeyCode"></xsl:when>
+<!--<xsl:when test="@linkKeyCode"></xsl:when>-->
 <xsl:when test="@extends"></xsl:when>
 <xsl:otherwise><xsl:if test="position() != '1'">, </xsl:if><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template></xsl:otherwise>
 </xsl:choose>
 <xsl:choose>
-<xsl:when test="@linkKeyCode"></xsl:when>
+<!--<xsl:when test="@linkKeyCode"></xsl:when>-->
 <xsl:when test="@extends"></xsl:when>
 <xsl:otherwise>
 <xsl:text> </xsl:text><xsl:value-of select="/meta/types/*[@id=$tp]/@type"/>
@@ -96,7 +96,7 @@ COMMENT ON COLUMN <xsl:value-of select="$dbTableName"/>.<xsl:call-template name=
 
 <xsl:template match="*" mode="comment-objects">
 <xsl:choose>
-<xsl:when test="@linkKeyCode"></xsl:when>
+<!--<xsl:when test="@linkKeyCode"></xsl:when>-->
 <xsl:when test="@extends"></xsl:when>
 <xsl:otherwise>
 <xsl:variable name="dbTableName"><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name(parent::*)'/></xsl:call-template></xsl:variable>
@@ -106,7 +106,7 @@ COMMENT ON COLUMN <xsl:value-of select="$dbTableName"/>.<xsl:call-template name=
 
 <xsl:template match="*" mode="comment-history-objects"><!-- todo похож на comment-objects только именем таблицы различается попробовать объединить -->
 <xsl:choose>
-<xsl:when test="@linkKeyCode"></xsl:when>
+<!--<xsl:when test="@ "></xsl:when>-->
 <xsl:when test="@extends"></xsl:when>
 <xsl:otherwise>
 <xsl:variable name="dbTableName"><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name(parent::*)'/></xsl:call-template></xsl:variable>
diff --git a/clearing-parent/backend-api/src/main/resources/meta/xsl/java.xsl b/clearing-parent/backend-api/src/main/resources/meta/xsl/java.xsl
index 0b4c78501..b2edb1613 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/xsl/java.xsl
+++ b/clearing-parent/backend-api/src/main/resources/meta/xsl/java.xsl
@@ -255,48 +255,44 @@ public class <xsl:value-of select="$nameObjFmt"/>HistoryMapStore extends Templat
 }
 </xsl:if>
 </xsl:template>
-<xsl:template match="*" mode="mapstore-field-getFields" ><xsl:if test="position() != '1'">, </xsl:if> "<xsl:choose>
+<xsl:template match="*" mode="mapstore-field-getFields" ><xsl:choose><xsl:when test="@extends"></xsl:when><xsl:otherwise><xsl:if test="position() != '1'">, </xsl:if> "<xsl:choose>
 <xsl:when test="@dbfield"><xsl:value-of select="@dbfield"/></xsl:when>
 <xsl:otherwise><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template></xsl:otherwise>
-</xsl:choose>"</xsl:template>
+</xsl:choose>"</xsl:otherwise></xsl:choose></xsl:template>
 <xsl:template match="*" mode="mapstore-field-setters" >
 <xsl:variable name="tp" select="@type"/>
-<xsl:variable name="javatp" select="/meta/types/*[@id=$tp]/@javatype"/>    <xsl:choose>
-<xsl:when test="$javatp='Instant'">
-object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(getInstantFromTimestamp(resultSet, "<xsl:choose>
+<xsl:text>    <!-- space &#160; 4 new line -->
+</xsl:text><xsl:if test="@extends">//ext: </xsl:if>
+<xsl:variable name="javatp" select="/meta/types/*[@id=$tp]/@javatype"/>
+<xsl:choose>
+<xsl:when test="$javatp='Instant'">object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(getInstantFromTimestamp(resultSet, "<xsl:choose>
 <xsl:when test="@dbfield"><xsl:value-of select="@dbfield"/></xsl:when>
 <xsl:otherwise><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template></xsl:otherwise>
 </xsl:choose>"))</xsl:when>
-<xsl:when test="$javatp='LocalDate'">
-object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(getLocalDateFromSqlDate(resultSet, "<xsl:choose>
+<xsl:when test="$javatp='LocalDate'">object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(getLocalDateFromSqlDate(resultSet, "<xsl:choose>
 <xsl:when test="@dbfield"><xsl:value-of select="@dbfield"/></xsl:when>
 <xsl:otherwise><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template></xsl:otherwise>
 </xsl:choose>"))</xsl:when>
-<xsl:when test="$javatp='LocalTime'">
-object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(getLocalTimeFromSqlTime(resultSet, "<xsl:choose>
+<xsl:when test="$javatp='LocalTime'">object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(getLocalTimeFromSqlTime(resultSet, "<xsl:choose>
 <xsl:when test="@dbfield"><xsl:value-of select="@dbfield"/></xsl:when>
 <xsl:otherwise><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template></xsl:otherwise>
 </xsl:choose>"))</xsl:when>
-<xsl:otherwise>
-object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(resultSet.getObject("<xsl:choose>
+<xsl:otherwise>object.set<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>(resultSet.getObject("<xsl:choose>
 <xsl:when test="@dbfield"><xsl:value-of select="@dbfield"/></xsl:when>
 <xsl:otherwise><xsl:call-template name='convertDbStyle'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template></xsl:otherwise>
 </xsl:choose>", <xsl:value-of select="$javatp"/>.class))</xsl:otherwise>
 </xsl:choose>;</xsl:template>
 
-<xsl:template match="*" mode="mapstore-field-getters" ><xsl:if test="position() != '1'">, </xsl:if><!-- todo запятую в конце а не в начале, см. last()-->
+<xsl:template match="*" mode="mapstore-field-getters" ><xsl:if test="position() != '1' and not(@extends)">, </xsl:if><!-- todo запятую в конце а не в начале, см. last()-->
 <xsl:variable name="tp" select="@type"/>
 <xsl:variable name="javatp" select="/meta/types/*[@id=$tp]/@javatype"/>
+<xsl:text>    <!-- space &#160; 4 new line -->
+</xsl:text><xsl:if test="@extends">//ext: </xsl:if>
 <xsl:choose>
-<xsl:when test="$javatp='Instant'">
-TimeUtil.toDateFromInstant(object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>())</xsl:when>
-<xsl:when test="$javatp='LocalDate'">
-TimeUtil.toDateFromLocalDate(object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>())</xsl:when>
-<xsl:when test="$javatp='LocalTime'">
-TimeUtil.toDateFromLocalTime(object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>())</xsl:when>
-<xsl:otherwise>
-object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>()</xsl:otherwise>
-</xsl:choose>
+<xsl:when test="$javatp='Instant'">TimeUtil.toDateFromInstant(object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>())</xsl:when>
+<xsl:when test="$javatp='LocalDate'">TimeUtil.toDateFromLocalDate(object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>())</xsl:when>
+<xsl:when test="$javatp='LocalTime'">TimeUtil.toDateFromLocalTime(object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>())</xsl:when>
+<xsl:otherwise>object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template>()</xsl:otherwise></xsl:choose>
 </xsl:template>
 
 
@@ -305,7 +301,7 @@ object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconv
 
 <xsl:variable name="tp" select="@type"/>
 
-<xsl:if test="name()='id'"> // (in parent) </xsl:if> private <xsl:value-of select="/meta/types/*[@id=$tp]/@javatype"/> <xsl:text> <!-- space &#160; --></xsl:text><xsl:value-of select="name()"/>;
+<xsl:if test="@extends"> // extend: </xsl:if><xsl:if test="name()='id'"> // (in parent) </xsl:if> private <xsl:value-of select="/meta/types/*[@id=$tp]/@javatype"/> <xsl:text> <!-- space &#160; --></xsl:text><xsl:value-of select="name()"/>;
 <xsl:choose>
 <xsl:when test="@dbfield"> // DB field: <xsl:value-of select="@dbfield"/></xsl:when>
 <!-- new line -->
@@ -360,6 +356,7 @@ object.get<xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconv
 <xsl:variable name="tp" select="@type"/>
 <xsl:choose>
 <xsl:when test="name()='id'"></xsl:when>
+<xsl:when test="@extends"></xsl:when>
 <xsl:otherwise>
     <xsl:variable name="NameFmt"><xsl:call-template name='convertFirstUC_'><xsl:with-param name='toconvert' select='name()'/></xsl:call-template></xsl:variable>
     public <xsl:value-of select="/meta/types/*[@id=$tp]/@javatype"/> get<xsl:value-of select="$NameFmt"/>() {