Merge pull request #725 from lserveriiev/feature/replace-thymeleaf-wi…

…th-jte

Replace Thymeleaf with JTE

api-rest/src/main/java/com/homihq/db2rest/jdbc/config/JdbcConfiguration.java

@@ -28,14 +28,16 @@
 import com.homihq.db2rest.multidb.DatabaseProperties;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import gg.jte.CodeResolver;
+import gg.jte.ContentType;
+import gg.jte.TemplateEngine;
+import gg.jte.resolve.ResourceCodeResolver;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
-import org.thymeleaf.spring6.SpringTemplateEngine;
 
 import javax.sql.DataSource;
 import java.util.HashMap;
@@ -116,12 +118,16 @@ public JdbcOperationService operationService() {
 
 
     @Bean
-    @DependsOn("textTemplateResolver")
-    public SqlCreatorTemplate sqlCreatorTemplate(SpringTemplateEngine templateEngine, JdbcManager jdbcManager
-                                                 ) {
+    public SqlCreatorTemplate sqlCreatorTemplate(TemplateEngine templateEngine, JdbcManager jdbcManager) {
         return new SqlCreatorTemplate(templateEngine, jdbcManager);
     }
 
+    @Bean
+    public TemplateEngine templateEngine() {
+        CodeResolver codeResolver =
+                new ResourceCodeResolver("sql-templates", this.getClass().getClassLoader());
+        return TemplateEngine.create(codeResolver, ContentType.Plain);
+    }
 
     //START ::: Processors
     @Bean

api-rest/src/main/resources/application.yml

@@ -29,10 +29,6 @@ spring:
   banner:
     location: classpath:banner.txt
 
-  thymeleaf:
-    check-template-location: false
-    cache: true
-
 
 db2rest:
 

api-rest/src/main/resources/sql-templates/count.jte

@@ -0,0 +1,10 @@
+@param String rootTable
+@param String rootWhere
+
+SELECT
+    COUNT(*)
+FROM
+    ${rootTable}
+@if(rootWhere != null)
+    WHERE ${rootWhere}
+@endif

api-rest/src/main/resources/sql-templates/delete-mssql.jte

@@ -0,0 +1,10 @@
+@param String rootTable
+@param String rootWhere
+@param String rootTableAlias
+
+DELETE FROM ${rootTableAlias}
+FROM ${rootTable}
+
+@if(rootWhere != null)
+    WHERE ${rootWhere}
+@endif

api-rest/src/main/resources/sql-templates/delete.jte

@@ -0,0 +1,8 @@
+@param String rootTable
+@param String rootWhere
+
+DELETE FROM
+    ${rootTable}
+@if(rootWhere != null)
+    WHERE ${rootWhere}
+@endif

api-rest/src/main/resources/sql-templates/exists-mssql.jte

@@ -0,0 +1,17 @@
+@import com.homihq.db2rest.jdbc.config.model.DbJoin
+@import java.util.List
+
+@param String rootTable
+@param String rootWhere
+@param List<DbJoin> joins
+
+SELECT TOP 1 1
+FROM ${rootTable}
+@if(joins != null)
+    @for(DbJoin join : joins)
+        ${join.render()}
+    @endfor
+@endif
+@if(rootWhere != null)
+    WHERE ${rootWhere}
+@endif

api-rest/src/main/resources/sql-templates/exists.jte

@@ -0,0 +1,19 @@
+@import com.homihq.db2rest.jdbc.config.model.DbJoin
+@import java.util.List
+
+@param String rootTable
+@param String rootWhere
+@param List<DbJoin> joins
+
+SELECT
+    1
+FROM ${rootTable}
+@if(joins != null)
+    @for(DbJoin join : joins)
+        ${join.render()}
+    @endfor
+@endif
+@if(rootWhere != null)
+    WHERE ${rootWhere}
+@endif
+LIMIT 1

api-rest/src/main/resources/sql-templates/find-one.jte

@@ -0,0 +1,11 @@
+@param String rootTable
+@param String rootWhere
+@param String columns
+
+SELECT
+    ${columns}
+FROM
+    ${rootTable}
+@if(rootWhere != null)
+    WHERE ${rootWhere}
+@endif

api-rest/src/main/resources/sql-templates/insert.jte

@@ -0,0 +1,8 @@
+@param String columns
+@param String table
+@param String parameters
+
+INSERT INTO ${table}
+    (${columns})
+VALUES
+    (${parameters})

api-rest/src/main/resources/sql-templates/read-mssql.jte

@@ -0,0 +1,70 @@
+@import com.homihq.db2rest.jdbc.config.model.DbJoin
+@import java.util.List
+
+@param List<DbJoin> joins
+@param String rootTable
+@param String columns
+@param String rootWhere
+@param String sorts
+@param Integer limit
+@param Long offset
+
+@if(sorts != null)
+    SELECT
+        ${columns}
+    FROM ${rootTable}
+    @if(joins != null)
+        @for(DbJoin join : joins)
+            ${join.render()}
+        @endfor
+    @endif
+    @if(rootWhere != null)
+        WHERE ${rootWhere}
+    @endif
+    ORDER BY ${sorts}
+    @if(limit != null)
+        OFFSET ${(offset == null ? 0 : offset)} ROWS FETCH NEXT ${limit} ROWS ONLY
+    @endif
+@elseif(limit != null)
+    @if(offset != null)
+        SELECT T.* FROM
+        (
+            SELECT
+                ${columns},
+                ROW_NUMBER() OVER(ORDER BY (SELECT 1)) AS rowIndex
+            FROM ${rootTable}
+            @if(joins != null)
+                @for(DbJoin join : joins)
+                    ${join.render()}
+                @endfor
+            @endif
+            @if(rootWhere != null)
+                WHERE ${rootWhere}
+            @endif
+        ) AS T
+        WHERE rowIndex > ${offset} AND rowIndex <= ${offset + limit}
+    @else
+        SELECT TOP ${limit} ${columns}
+        FROM ${rootTable}
+        @if(joins != null)
+            @for(DbJoin join : joins)
+                ${join.render()}
+            @endfor
+        @endif
+        @if(rootWhere != null)
+            WHERE ${rootWhere}
+        @endif
+    @endif
+@else
+    SELECT
+        ${columns}
+    FROM ${rootTable}
+    @if(joins != null)
+        @for(DbJoin join : joins)
+            ${join.render()}
+        @endfor
+    @endif
+    @if(rootWhere != null)
+        WHERE ${rootWhere}
+    @endif
+@endif

api-rest/src/main/resources/sql-templates/read-ora-12.jte

@@ -0,0 +1,34 @@
+@import com.homihq.db2rest.jdbc.config.model.DbJoin
+@import java.util.List
+
+@param List<DbJoin> joins
+@param String rootTable
+@param String columns
+@param String rootWhere
+@param String sorts
+@param Integer limit
+@param Long offset
+
+SELECT
+    ${columns}
+FROM
+    ${rootTable}
+@if(joins != null)
+    @for(DbJoin join : joins)
+        ${join.render()}
+    @endfor
+@endif
+@if(rootWhere != null)
+    WHERE ${rootWhere}
+@endif
+@if(sorts != null)
+    ORDER BY ${sorts}
+@endif
+@if(limit != null)
+    @if(offset != null)
+        OFFSET ${offset} ROWS
+        FETCH NEXT ${limit} ROWS ONLY
+    @else
+        FETCH FIRST ${limit} ROWS ONLY
+    @endif
+@endif