added function to pg script, replaced QueryRequest class with record,…

… moved QueryRequest and CountResponse to dto

src/main/java/com/homihq/db2rest/rest/read/CountQueryController.java

@@ -1,6 +1,6 @@
 package com.homihq.db2rest.rest.read;
 
-import com.homihq.db2rest.rest.read.model.CountResponse;
+import com.homihq.db2rest.rest.read.dto.CountResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/homihq/db2rest/rest/read/CountQueryService.java

@@ -2,7 +2,7 @@
 
 import com.homihq.db2rest.rest.read.helper.*;
 
-import com.homihq.db2rest.rest.read.model.CountResponse;
+import com.homihq.db2rest.rest.read.dto.CountResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;

src/main/java/com/homihq/db2rest/rest/read/ReadController.java

@@ -1,6 +1,6 @@
 package com.homihq.db2rest.rest.read;
 
-import com.homihq.db2rest.rest.read.model.QueryRequest;
+import com.homihq.db2rest.rest.read.dto.QueryRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -47,7 +47,7 @@ public Object findByJoinTable(@PathVariable String tableName,
     @PostMapping(value = "/query", consumes = MediaType.APPLICATION_JSON_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<Object> findByCustomQuery(@RequestBody @Valid QueryRequest queryRequest) {
-        log.debug("Execute SQL statement {} with params {}", queryRequest.getSql(), queryRequest.getParams());
+        log.debug("Execute SQL statement {} with params {}", queryRequest.sql(), queryRequest.params());
         return ResponseEntity.ok(readService.findByCustomQuery(queryRequest));
     }
 

src/main/java/com/homihq/db2rest/rest/read/ReadService.java

@@ -1,7 +1,7 @@
 package com.homihq.db2rest.rest.read;
 
 import com.homihq.db2rest.rest.read.helper.*;
-import com.homihq.db2rest.rest.read.model.QueryRequest;
+import com.homihq.db2rest.rest.read.dto.QueryRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
@@ -49,8 +49,8 @@ public Object findAll(String schemaName, String tableName, String select, String
 
 
     Object findByCustomQuery(QueryRequest queryRequest) {
-        return queryRequest.isSingle() ?
-                namedParameterJdbcTemplate.queryForMap(queryRequest.getSql(), queryRequest.getParams()) :
-                namedParameterJdbcTemplate.queryForList(queryRequest.getSql(), queryRequest.getParams());
+        return queryRequest.single() ?
+                namedParameterJdbcTemplate.queryForMap(queryRequest.sql(), queryRequest.params()) :
+                namedParameterJdbcTemplate.queryForList(queryRequest.sql(), queryRequest.params());
     }
 }

src/main/java/com/homihq/db2rest/rest/read/model/CountResponse.java → src/main/java/com/homihq/db2rest/rest/read/dto/CountResponse.java

@@ -1,4 +1,4 @@
-package com.homihq.db2rest.rest.read.model;
+package com.homihq.db2rest.rest.read.dto;
 
 public record CountResponse(long count) {
 }

src/main/java/com/homihq/db2rest/rest/read/dto/QueryRequest.java

@@ -0,0 +1,8 @@
+package com.homihq.db2rest.rest.read.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import java.util.Map;
+
+public record QueryRequest(@NotEmpty(message = "Sql statement cannot be empty") String sql, Map<String, Object> params,
+                           boolean single) {
+}