Merge remote-tracking branch 'origin/master' into feature/dialects_in…

…_sub_folders
9tigerio · Dec 6, 2024 · ceb53bd · ceb53bd
2 parents bfdc47e + c69166e
commit ceb53bd
Show file tree

Hide file tree

Showing 247 changed files with 3,933 additions and 3,496 deletions.
diff --git a/README.md b/README.md
@@ -24,24 +24,19 @@ deliver context-aware, reasoning applications without any vendor lock-in. :bulb:
 
 # Stable Releases
 
-| Release              | Download/Docker Pull                                                              |
-|----------------------|-----------------------------------------------------------------------------------|
-| 1.4.0                | [DB2Rest-1.4.0](https://repo1.maven.org/maven2/io/9tiger/db2rest/1.4.0/db2rest-1.4.0.jar) |
-| Oracle9i - 1.2.3     | [DB2Rest-Oracle9i-1.2.3](https://download.db2rest.com/db2rest-oracle9i-1.2.3.jar) |
-| 1.4.0 (Docker Image) | ` docker pull kdhrubo/db2rest:v1.4.0 ` or ` docker pull kdhrubo/db2rest:latest `  |
+| Release                             | Download/Docker Pull                                                              |
+|-------------------------------------|-----------------------------------------------------------------------------------|
+| 1.4.1                               | [DB2Rest-1.4.1](https://download.db2rest.com/db2rest-1.4.1.jar)                   |
+| 1.4.1 (Docker Image)                | ` docker pull kdhrubo/db2rest:v1.4.1 ` or ` docker pull kdhrubo/db2rest:latest `  |
+| Oracle9i - 1.2.3 <mark>Final</mark> | [DB2Rest-Oracle9i-1.2.3](https://download.db2rest.com/db2rest-oracle9i-1.2.3.jar) |
+
 
 # Quick start guides
 
 [On premise / On Virtual Machines installation guide](https://db2rest.com/docs/intro).
 
 [Docker based installation guide](https://db2rest.com/docs/run-db2rest-on-docker).
 
-# Building
-Use `mvn verify` or `mvn clean package` , etc. from repo root folder, and pass in a value for `revision` to override the current default version in POMs:
-`mvn -Drevision="1.5.4-SNAPSHOT" clean package -DskipTests`
-
-# Testing
-Running tests simply requires a Docker daemon running, where the build will automatically pull and run testcontainers for the database tests.
 
 # Use Cases 
 
@@ -100,6 +95,14 @@ Feel like contributing? That's awesome! We have a [contributing guide](https://g
 
 Our docsite lives in a [separate repo](https://github.com/9tigerio/db2rest-web). If you're interested in contributing to the documentation, check out the docsite contribution guide.
 
+# Building
+Use `mvn verify` or `mvn clean package` , etc. from repo root folder, and pass in a value for `revision` to override the current default version in POMs:
+`mvn -Drevision="1.5.4-SNAPSHOT" clean package -DskipTests`
+
+# Testing
+Running tests simply requires a Docker daemon running, where the build will automatically pull and run testcontainers for the database tests.
+
+
 # Support
 
 *Connect on Discord*
@@ -118,3 +121,5 @@ Refer to [open roadmap](https://db2rest.com/roadmap/) items.
 # IDE Sponsor
 
 ![JetBrains logo](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)
+
+
diff --git a/api-rest/pom.xml b/api-rest/pom.xml
@@ -93,6 +93,12 @@
             <version>2.2.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.hubspot.jinjava</groupId>
+            <artifactId>jinjava</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -218,6 +224,26 @@
             </resource>
         </resources>
         <plugins>
+
+            <plugin>
+                <groupId>gg.jte</groupId>
+                <artifactId>jte-maven-plugin</artifactId>
+                <version>${jte.version}</version>
+                <configuration>
+                    <!-- This is the directory where your .jte files are located. -->
+                    <sourceDirectory>${project.basedir}/src/main/resources/sql-templates</sourceDirectory>
+                    <contentType>Plain</contentType>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>

diff --git a/api-rest/src/main/java/com/homihq/db2rest/interceptor/DatabaseContextRequestInterceptor.java b/api-rest/src/main/java/com/homihq/db2rest/interceptor/DatabaseContextRequestInterceptor.java
@@ -18,55 +18,55 @@
 
 import static com.homihq.db2rest.jdbc.rest.RdbmsRestApi.VERSION;
 
-
 @Slf4j
 @Component
 public class DatabaseContextRequestInterceptor implements AsyncHandlerInterceptor {
 
-        private final List<String> WHITE_LIST = List.of(
-                "/swagger-ui/**", "/v3/api-docs/**", "/actuator/**",
-                VERSION + "/$dbs");
+    private final List<String> whiteList = List.of(
+            "/swagger-ui/**", "/v3/api-docs/**", "/actuator/**",
+            VERSION + "/$dbs");
 
-        private final AntPathMatcher antPathMatcher = new AntPathMatcher();
+    private final AntPathMatcher antPathMatcher = new AntPathMatcher();
 
-       @Override
-       public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-           log.debug("Pre handle - {}", request.getRequestURI());
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        log.debug("Pre handle - {}", request.getRequestURI());
 
-           if(!isWhileListed(request.getRequestURI())) {
-               final Map<String, String> pathVariables = (Map<String, String>) request
-                       .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+        if (!isWhileListed(request.getRequestURI())) {
+            final Map<String, String> pathVariables = (Map<String, String>) request
+                    .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
 
-               log.debug("pathVariables - {}", pathVariables);
+            log.debug("pathVariables - {}", pathVariables);
 
-               if(Objects.isNull(pathVariables)) throw new GenericDataAccessException("Database ID not found.");
+            if (Objects.isNull(pathVariables)) {
+                throw new GenericDataAccessException("Database ID not found.");
+            }
 
-               String dbId = pathVariables.get("dbId");
+            String dbId = pathVariables.get("dbId");
 
-               log.debug("Db identifier : {}", dbId);
+            log.debug("Db identifier : {}", dbId);
 
-               if(StringUtils.isNotBlank(dbId)) {
-                   this.setTenantContext(dbId);
-               }
-               else{
-                   log.info("DB could not be determined.");
-                   throw new GenericDataAccessException("Database ID not found.");
-               }
-           }
+            if (StringUtils.isNotBlank(dbId)) {
+                this.setTenantContext(dbId);
+            } else {
+                log.info("DB could not be determined.");
+                throw new GenericDataAccessException("Database ID not found.");
+            }
+        }
 
-           return true;
-       }
+        return true;
+    }
 
     private boolean isWhileListed(String uri) {
-        return WHITE_LIST.stream().anyMatch(w -> antPathMatcher.match(w, uri));
+        return whiteList.stream().anyMatch(w -> antPathMatcher.match(w, uri));
     }
 
     @Override
-       public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) {
-           DatabaseContextHolder.clear();
-       }
-         
-       private void setTenantContext(String tenant) {
-           DatabaseContextHolder.setCurrentDbId(tenant);
-       }
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) {
+        DatabaseContextHolder.clear();
+    }
+
+    private void setTenantContext(String tenant) {
+        DatabaseContextHolder.setCurrentDbId(tenant);
+    }
 }
diff --git a/api-rest/src/main/java/com/homihq/db2rest/jdbc/config/JdbcConfiguration.java b/api-rest/src/main/java/com/homihq/db2rest/jdbc/config/JdbcConfiguration.java
@@ -49,18 +49,15 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 @Slf4j
 @Configuration
 @RequiredArgsConstructor
 public class JdbcConfiguration {
 
-
     private final DatabaseProperties databaseProperties;
     private final ObjectMapper objectMapper;
 
-
     @Bean
     @ConditionalOnMissingBean(DataSource.class)
     public DataSource dataSource() {
@@ -78,15 +75,15 @@ private Map<Object, Object> buildDataSources() {
 
         log.debug("Databases - {}", databaseProperties.getDatabases());
 
-        if(!databaseProperties.isRdbmsConfigured()) {
+        if (!databaseProperties.isRdbmsConfigured()) {
             log.info("*** No RDBMS configured.");
             return result;
         }
 
 
         for (DatabaseConnectionDetail connectionDetail : databaseProperties.getDatabases()) {
 
-            if(connectionDetail.isJdbcPresent())
+            if (connectionDetail.isJdbcPresent())
                 result.put(connectionDetail.id(), this.buildDataSource(connectionDetail));
         }
 
@@ -133,8 +130,9 @@ public SqlCreatorTemplate sqlCreatorTemplate(TemplateEngine templateEngine, Jdbc
     @Bean
     public TemplateEngine templateEngine() {
         CodeResolver codeResolver =
-                new ResourceCodeResolver("sql-templates", this.getClass().getClassLoader());
-        return TemplateEngine.create(codeResolver, ContentType.Plain);
+                new ResourceCodeResolver("sql-templates");
+        return TemplateEngine
+                .createPrecompiled(ContentType.Plain);
     }
 
     @Bean
@@ -227,7 +225,7 @@ public ExistsQueryService existsQueryService(
             SqlCreatorTemplate sqlCreatorTemplate,
             List<ReadProcessor> processorList,
             DbOperationService dbOperationService) {
-        return new JdbcExistsQueryService(jdbcManager,dbOperationService, processorList, sqlCreatorTemplate);
+        return new JdbcExistsQueryService(jdbcManager, dbOperationService, processorList, sqlCreatorTemplate);
     }
 
     @Bean
@@ -236,7 +234,7 @@ public FindOneService findOneService(
             SqlCreatorTemplate sqlCreatorTemplate,
             List<ReadProcessor> processorList,
             DbOperationService dbOperationService) {
-        return new JdbcFindOneService(jdbcManager,sqlCreatorTemplate, processorList, dbOperationService);
+        return new JdbcFindOneService(jdbcManager, sqlCreatorTemplate, processorList, dbOperationService);
     }
 
     @Bean
@@ -336,7 +334,7 @@ public FindOneController findOneController(FindOneService findOneService) {
 
     @Bean
     @ConditionalOnBean(ReadService.class)
-    public ReadController readController(ReadService readService,  Db2RestConfigProperties configProperties) {
+    public ReadController readController(ReadService readService, Db2RestConfigProperties configProperties) {
         return new ReadController(readService, configProperties);
     }
 
@@ -381,7 +379,7 @@ public SQLTemplateController sqlTemplateController(
     ) {
         return new SQLTemplateController(sqlTemplateExecutorService);
     }
-  
+
     @ConditionalOnBean(JdbcManager.class)
     public DbInfoController dbInfoController(JdbcManager jdbcManager) {
         return new DbInfoController(jdbcManager);

diff --git a/...in/java/com/homihq/db2rest/jdbc/config/jinjava/DisabledExpressionTokenScannerSymbols.java b/...in/java/com/homihq/db2rest/jdbc/config/jinjava/DisabledExpressionTokenScannerSymbols.java
@@ -3,13 +3,13 @@
 import com.hubspot.jinjava.tree.parse.DefaultTokenScannerSymbols;
 
 public class DisabledExpressionTokenScannerSymbols extends DefaultTokenScannerSymbols {
-	@Override
-	public int getExprStart() {
-		return 0;
-	}
+    @Override
+    public int getExprStart() {
+        return 0;
+    }
 
-	@Override
-	public int getExprEnd() {
-		return 0;
-	}
+    @Override
+    public int getExprEnd() {
+        return 0;
+    }
 }
diff --git a/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/create/BulkCreateRestApi.java b/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/create/BulkCreateRestApi.java
@@ -4,7 +4,11 @@
 import com.homihq.db2rest.core.dto.CreateResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;

diff --git a/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/create/CreateController.java b/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/create/CreateController.java
@@ -1,8 +1,8 @@
 package com.homihq.db2rest.jdbc.rest.create;
 
 
-import com.homihq.db2rest.jdbc.core.service.CreateService;
 import com.homihq.db2rest.core.dto.CreateResponse;
+import com.homihq.db2rest.jdbc.core.service.CreateService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,12 +19,13 @@ public class CreateController implements CreateRestApi {
 
     @Override
     public CreateResponse save(
-                    String dbId, String schemaName,
-                                String tableName,
-                               List<String> includeColumns,
-                               List<String> sequences,
-                               Map<String, Object> data,
-                               boolean tsIdEnabled) {
+            String dbId, String schemaName,
+            String tableName,
+            List<String> includeColumns,
+            List<String> sequences,
+            Map<String, Object> data,
+            boolean tsIdEnabled
+    ) {
 
         return createService
                 .save(dbId, schemaName, tableName, includeColumns, data, tsIdEnabled, sequences);

diff --git a/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/create/CreateRestApi.java b/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/create/CreateRestApi.java
@@ -1,18 +1,24 @@
 package com.homihq.db2rest.jdbc.rest.create;
 
 import com.homihq.db2rest.core.dto.CreateResponse;
-import static com.homihq.db2rest.jdbc.rest.RdbmsRestApi.VERSION;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 import java.util.List;
 import java.util.Map;
 
+import static com.homihq.db2rest.jdbc.rest.RdbmsRestApi.VERSION;
+
 public interface CreateRestApi {
     @ResponseStatus(HttpStatus.CREATED)
     @PostMapping(VERSION + "/{dbId}/{tableName}")
     CreateResponse save(@PathVariable String dbId,
-                        @RequestHeader(name="Content-Profile", required = false) String schemaName,
+                        @RequestHeader(name = "Content-Profile", required = false) String schemaName,
                         @PathVariable String tableName,
                         @RequestParam(name = "columns", required = false) List<String> includeColumns,
                         @RequestParam(name = "sequences", required = false) List<String> sequences,

diff --git a/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/delete/DeleteController.java b/api-rest/src/main/java/com/homihq/db2rest/jdbc/rest/delete/DeleteController.java
@@ -1,11 +1,11 @@
 package com.homihq.db2rest.jdbc.rest.delete;
 
 import com.homihq.db2rest.config.Db2RestConfigProperties;
-import com.homihq.db2rest.jdbc.core.service.DeleteService;
 import com.homihq.db2rest.core.dto.DeleteResponse;
+import com.homihq.db2rest.jdbc.core.service.DeleteService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @Slf4j
@@ -20,7 +20,8 @@ public DeleteResponse delete(
             String dbId,
             String schemaName,
             String tableName,
-                                 String filter) {
+            String filter
+    ) {
 
         db2RestConfigProperties.checkDeleteAllowed(filter);