new version, transaction cleanups

Author: gtiwari333

docker-compose.yml

@@ -18,7 +18,6 @@ services:
             - "MYSQL_DATABASE=noteappdb"
         ports:
             - 3306:3306
-        command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
         networks:
             - note-app-network
         labels:
@@ -28,14 +27,12 @@ services:
         profiles:
             - all
 
-volumes:
-    esdata1:
-        driver: local
 networks:
     note-app-network:
         driver: bridge
 
 
 #run using
-#docker-compose -f docker-compose.yml up
-# or just docker-compose up
+#docker-compose --profile all up OR
+#docker-compose --profile mailHog up
+

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.0-M3</version>
+        <version>3.4.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -16,25 +16,25 @@
     <properties>
         <java.version>21</java.version>
 
-        <springdoc-openapi-ui.version>2.6.0</springdoc-openapi-ui.version>
-        <mapstruct.version>1.6.2</mapstruct.version>
+        <springdoc-openapi-ui.version>2.8.5</springdoc-openapi-ui.version>
+        <mapstruct.version>1.6.3</mapstruct.version>
 
-        <selenide.version>7.5.1</selenide.version>
+        <selenide.version>7.7.3</selenide.version>
 
         <wro4j.version>1.9.0</wro4j.version>
-        <spock.version>2.4-M4-groovy-4.0</spock.version>
+        <spock.version>2.4-M5-groovy-4.0</spock.version>
         <!-- client deps -->
         <webjar-jquery.version>3.5.1</webjar-jquery.version>
         <webjar-bootstrap.version>4.5.0</webjar-bootstrap.version>
         <webjar-popperjs.version>2.0.2</webjar-popperjs.version>
 
 
         <!-- code quality -->
-        <archunit-junit5.version>1.3.0</archunit-junit5.version>
+        <archunit-junit5.version>1.4.0</archunit-junit5.version>
         <sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
-        <maven.checkstyle.plugin.version>3.3.0</maven.checkstyle.plugin.version>
-        <puppycrawl.checkstyle.version>10.18.1</puppycrawl.checkstyle.version>
+        <maven.checkstyle.plugin.version>3.6.0</maven.checkstyle.plugin.version>
+        <puppycrawl.checkstyle.version>10.21.4</puppycrawl.checkstyle.version>
         <puppycrawl.checkstyle.config.file>src/main/resources/checkstyle.xml</puppycrawl.checkstyle.config.file>
 
 
@@ -55,12 +55,12 @@
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
         <google.error-prone.compiler.version>2.19.1</google.error-prone.compiler.version>
-        <groovy.maven.plugin.version>3.0.2</groovy.maven.plugin.version>
-        <modernizer-maven-plugin.version>2.7.0</modernizer-maven-plugin.version>
-        <spotbugs.plugin.version>4.7.3.6</spotbugs.plugin.version>
+        <groovy.maven.plugin.version>4.1.1</groovy.maven.plugin.version>
+        <modernizer-maven-plugin.version>3.1.0</modernizer-maven-plugin.version>
+        <spotbugs.plugin.version>4.9.2.0</spotbugs.plugin.version>
         <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
         <sb-contrib-plugin.version>7.6.0</sb-contrib-plugin.version>
-        <owasp-dependency-check-plugin.version>8.4.0</owasp-dependency-check-plugin.version>
+        <owasp-dependency-check-plugin.version>12.1.0</owasp-dependency-check-plugin.version>
     </properties>
 
 

src/main/java/gt/app/DataCreator.java

@@ -15,6 +15,7 @@
 import org.springframework.stereotype.Component;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.stream.Stream;
 
 @Component
@@ -39,9 +40,9 @@ public void ctxRefreshed(ContextRefreshedEvent evt) {
     public void initData() {
         log.info("Context Refreshed !!, Initializing Data... ");
 
-        File uploadFolder = new File(appProperties.fileStorage().uploadFolder());
+        File uploadFolder = Path.of(appProperties.fileStorage().uploadFolder()).toFile();
         if (!uploadFolder.exists()) {
-            if (uploadFolder.mkdirs() && Stream.of(ReceivedFile.FileGroup.values()).allMatch(f -> new File(uploadFolder.getAbsolutePath()).mkdir())) {
+            if (uploadFolder.mkdirs() && Stream.of(ReceivedFile.FileGroup.values()).allMatch(f ->   Path.of(uploadFolder.getAbsolutePath()).toFile().mkdir())) {
                 log.info("Upload folder created successfully");
             } else {
                 log.info("Failure to create upload folder");

src/main/java/gt/app/modules/file/FileService.java

@@ -10,7 +10,6 @@
 import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.UUID;
 
 @Service
@@ -19,7 +18,7 @@ public class FileService {
     private final Path rootLocation;
 
     public FileService(AppProperties appProperties) {
-        this.rootLocation = Paths.get(appProperties.fileStorage().uploadFolder());
+        this.rootLocation = Path.of(appProperties.fileStorage().uploadFolder());
     }
 
     public String store(ReceivedFile.FileGroup fileGroup, @NotNull MultipartFile file) {

src/main/java/gt/app/modules/file/ReceivedFileService.java

@@ -3,7 +3,6 @@
 import gt.app.domain.ReceivedFile;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 import java.util.UUID;
@@ -14,7 +13,6 @@ public class ReceivedFileService {
 
     final ReceivedFileRepository receivedFileRepository;
 
-    @Transactional
     public Optional<ReceivedFile> findById(UUID id) {
         return receivedFileRepository.findById(id);
     }

src/main/java/gt/app/modules/note/NoteRepository.java

@@ -7,25 +7,20 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
 interface NoteRepository extends JpaRepository<Note, Long> {
 
-    @EntityGraph(attributePaths = {"createdByUser"})
-    @Transactional(readOnly = true)
+    @EntityGraph(attributePaths = {"createdByUser", "attachedFiles"})
     Optional<Note> findById(Long id);
 
-    @EntityGraph(attributePaths = {"createdByUser"})
-    @Transactional(readOnly = true)
+    @EntityGraph(attributePaths = {"createdByUser", "attachedFiles"})
     Page<Note> findAll(Pageable pageable);
 
-    @EntityGraph(attributePaths = {"createdByUser"})
-    @Transactional(readOnly = true)
+    @EntityGraph(attributePaths = {"createdByUser", "attachedFiles"})
     Page<Note> findByCreatedByUserIdOrderByCreatedDateDesc(Pageable pageable, Long userId);
 
     @Query("select n.createdByUser.id from Note n where n.id=:id ")
-    @Transactional(readOnly = true)
     Long findCreatedByUserIdById(@Param("id") Long id);
 }

src/main/java/gt/app/modules/note/NoteService.java

@@ -11,7 +11,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
@@ -47,7 +46,6 @@ public Note createNote(NoteCreateDto dto) {
         return save(note);
     }
 
-    @Transactional
     public Note update(NoteEditDto dto) {
 
         Optional<Note> noteOpt = noteRepository.findById(dto.id());
@@ -57,7 +55,6 @@ public Note update(NoteEditDto dto) {
         }).orElseThrow();
     }
 
-    @Transactional
     public NoteReadDto read(Long id) {
         return noteRepository.findById(id)
             .map(noteMapper::mapForRead).orElseThrow();
@@ -67,13 +64,11 @@ public Note save(Note note) {
         return noteRepository.save(note);
     }
 
-    @Transactional
     public Page<NoteReadDto> readAll(Pageable pageable) {
         return noteRepository.findAll(pageable)
             .map(noteMapper::mapForRead);
     }
 
-    @Transactional
     public Page<NoteReadDto> readAllByUser(Pageable pageable, Long userId) {
         return noteRepository.findByCreatedByUserIdOrderByCreatedDateDesc(pageable, userId)
             .map(noteMapper::mapForRead);

src/main/java/gt/app/modules/user/AppUserDetailsService.java

@@ -5,7 +5,6 @@
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -24,7 +23,6 @@ public AppUserDetails loadUserByUsername(String email) {
             .orElseThrow(() -> new UsernameNotFoundException(" User with login:" + email + " was not found in the " + " database "));
     }
 
-    @Transactional(readOnly = true)
     public AppUserDetails getCustomUserDetails(AppUser user) {
 
         return new AppUserDetails(user.getId(), user.getUsername(), user.getEmail(), user.getPassword(), user.getFirstName(), user.getLastName(), user.getAuthorities(),

src/main/java/gt/app/modules/user/AuthorityRepository.java

@@ -2,12 +2,10 @@
 
 import gt.app.domain.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Set;
 
 interface AuthorityRepository extends JpaRepository<Authority, String> {
-    @Transactional(readOnly = true)
     Set<Authority> findByNameIn(Collection<String> name);
 }

src/main/java/gt/app/modules/user/LiteUserRepository.java

@@ -2,14 +2,11 @@
 
 import gt.app.domain.LiteUser;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
 interface LiteUserRepository extends JpaRepository<LiteUser, Long> {
-    @Transactional(readOnly = true)
     Optional<LiteUser> findOneByUniqueId(String uniqueId);
 
-    @Transactional(readOnly = true)
     Optional<LiteUser> findByIdAndActiveIsTrue(Long id);
 }

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

@@ -6,11 +6,9 @@
 import gt.app.modules.note.NoteService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service("appSecurity")
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class UserAuthorityService {
 
     private final NoteService noteService;

src/main/java/gt/app/modules/user/UserRepository.java

@@ -3,17 +3,14 @@
 import gt.app.domain.AppUser;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
 interface UserRepository extends JpaRepository<AppUser, Long> {
 
     @EntityGraph(attributePaths = {"authorities"})
-    @Transactional(readOnly = true)
     Optional<AppUser> findOneWithAuthoritiesByUniqueId(String uniqueId);
 
-    @Transactional(readOnly = true)
     boolean existsByUniqueId(String uniqueId);
 
     Optional<AppUser> findByIdAndActiveIsTrue(Long id);

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

@@ -13,12 +13,10 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Set;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class UserService {
 

src/main/resources/application.yml

@@ -48,6 +48,5 @@ app-properties:
 
 
 spring-doc:
-    enable-native-support: true
     show-actuator: true