added flexy pool, better transaction management - removed unnecessary @transactional for better performance

Author: gtiwari333

main-app/main-webapp/pom.xml

@@ -267,7 +267,10 @@
             <groupId>net.ttddyy.observation</groupId>
             <artifactId>datasource-micrometer-spring-boot</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.github.gavlyukovskiy</groupId>
+            <artifactId>flexy-pool-spring-boot-starter</artifactId>
+        </dependency>
         <!-- spock deps -->
         <dependency>
             <groupId>org.spockframework</groupId>

main-app/main-webapp/src/main/java/gt/app/modules/article/ArticleService.java

@@ -16,6 +16,7 @@
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
@@ -26,7 +27,6 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-@Transactional
 public class ArticleService {
 
     private static final ReceivedFile.FileGroup FILE_GROUP = ReceivedFile.FileGroup.NOTE_ATTACHMENT;
@@ -36,6 +36,7 @@ public class ArticleService {
     private final CommentRepository commentRepo;
     private final ContentCheckService contentCheckService;
     private final WebsocketHandler websocketHandler;
+    private final TransactionTemplate transactionTemplate;
 
     public Article createArticle(ArticleCreateDto dto) {
 
@@ -54,15 +55,16 @@ public Article createArticle(ArticleCreateDto dto) {
         article.getAttachedFiles().addAll(files);
         article.setStatus(ArticleStatus.UNDER_AUTO_REVIEW);
 
-        articleRepository.save(article);
-
-        contentCheckService.sendForAutoContentReview(article);
+        transactionTemplate.executeWithoutResult(status -> {
+            articleRepository.save(article);
+            contentCheckService.sendForAutoContentReview(article);
+        });
 
         return article;
     }
 
+    //single update statement - no transaction required
     public Article update(ArticleEditDto dto) {
-
         Optional<Article> articleOpt = articleRepository.findWithFilesAndUserById(dto.getId());
         return articleOpt.map(article -> {
                 ArticleMapper.INSTANCE.createToEntity(dto, article);
@@ -142,12 +144,13 @@ public UUID findCreatedByUserIdById(Long articleId) {
         return articleRepository.findCreatedByUserIdById(articleId);
     }
 
-    @Transactional
     public Optional<Article> handleReview(ArticleReviewResultDto dto) {
         return articleRepository.findWithModifiedUserByIdAndStatus(dto.getId(), ArticleStatus.FLAGGED_FOR_MANUAL_REVIEW)
             .map(n -> {
-                n.setStatus(dto.getVerdict());
-                articleRepository.save(n);
+                transactionTemplate.executeWithoutResult(txSt -> {
+                    n.setStatus(dto.getVerdict());
+                    articleRepository.save(n);
+                });
                 websocketHandler.sendToUser(n.getLastModifiedByUser().getUsername(), "Your article with title " + n.getTitle() + " has been " + (dto.getVerdict() == ArticleStatus.PUBLISHED ? "approved from manual review." : "rejected from manual review."));
                 return n;
             });

main-app/main-webapp/src/main/java/gt/app/modules/article/CommentService.java

@@ -16,6 +16,7 @@ public class CommentService {
     final CommentRepository commentRepository;
     final ContentCheckService contentCheckService;
 
+    //no transaction required - single operation
     public void save(NewCommentDto c) {
         Comment comment = new Comment(c.content, c.articleId);
 

main-app/main-webapp/src/main/java/gt/app/modules/review/ArticleReviewResponseService.java

@@ -27,6 +27,7 @@ class ArticleReviewResponseService {
     private final AppProperties appProperties;
     private final WebsocketHandler websocketHandler;
 
+    //no transaction required here - single operation
     void handle(Response resp) {
         Article a = articleRepository.findOneWithUserById(Long.valueOf(resp.getEntityId())).orElseThrow();
         switch (resp.getContentCheckOutcome()) {

main-app/main-webapp/src/main/java/gt/app/modules/user/UserAuthorityService.java

@@ -6,14 +6,12 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 
 @Service("appSecurity")
 @RequiredArgsConstructor
 @Slf4j
-@Transactional(readOnly = true)
 public class UserAuthorityService {
 
     private final ArticleService articleService;

main-app/main-webapp/src/main/java/gt/app/modules/user/UserService.java

@@ -4,12 +4,10 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 @Slf4j
 public class UserService {

main-app/main-webapp/src/main/resources/application.yml

@@ -44,7 +44,7 @@ logging:
         web: INFO
         cloud: INFO
         sql: INFO
-        ROOT: WARN
+        ROOT: INFO
         gt: TRACE
 #        'org.springframework.web.socket': TRACE
 
@@ -69,7 +69,12 @@ wro4j:
 # note that both `jdbc.datasource-proxy` and `decorator.datasource` cannot be enabled at same time due to bean name conflict
 decorator:
     datasource:
-        enabled: false  # disabled for now
+        enabled: true  # disabled for now
+        flexy-pool:
+            threshold:
+                connection:
+                    acquire: -1
+                    lease: 0
         datasource-proxy:
             slow-query:
                 threshold: 1 # 1 second is slow
@@ -78,7 +83,7 @@ decorator:
 # https://github.com/jdbc-observations/datasource-micrometer
 jdbc:
     datasource-proxy:
-        enabled: true
+        enabled: false
 
 management:
     tracing:

main-app/main-webapp/src/test/groovy/gt/app/modules/article/ArticleServiceSpec.groovy

@@ -23,7 +23,7 @@ class ArticleServiceSpec extends Specification {
         commentRepo = Mock()
         commentRepo = Mock()
         contentCheckRequestService = Mock()
-        articleService = new ArticleService(articleRepository, fileService, jmsTemplate, commentRepo, contentCheckRequestService, null)
+        articleService = new ArticleService(articleRepository, fileService, jmsTemplate, commentRepo, contentCheckRequestService, null, null)
     }
 
     def 'save article'() {

main-app/main-webapp/src/test/java/gt/app/modules/article/ArticleServiceTest.java

@@ -33,7 +33,7 @@ void testMapNested() {
          */
 
         ArticleReadDto flat = getTestArticle();
-        var service = new ArticleService(null, null, null, null, null, null);
+        var service = new ArticleService(null, null, null, null, null,  null,null);
 
         ArticleReadDto nested = service.mapNested(flat);
 

pom.xml

@@ -34,7 +34,7 @@
         <spring-cloud.version>2024.0.0</spring-cloud.version>
         <hibernate-types60.version>2.21.1</hibernate-types60.version>
         <hibernate-hypersistence-utils.version>3.6.1</hibernate-hypersistence-utils.version>
-        <datasource-proxy-sb-starter.version>1.9.2</datasource-proxy-sb-starter.version>
+        <datasource-proxy-sb-starter.version>1.10.0</datasource-proxy-sb-starter.version>
         <datasource-micrometer-sb-starter.version>1.0.5</datasource-micrometer-sb-starter.version>
         <springdoc-openapi-ui.version>2.8.5</springdoc-openapi-ui.version>
         <mapstruct.version>1.6.2</mapstruct.version>
@@ -160,7 +160,11 @@
                 <artifactId>datasource-micrometer-spring-boot</artifactId>
                 <version>${datasource-micrometer-sb-starter.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.github.gavlyukovskiy</groupId>
+                <artifactId>flexy-pool-spring-boot-starter</artifactId>
+                <version>${datasource-proxy-sb-starter.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tngtech.archunit</groupId>
                 <artifactId>archunit</artifactId>