Merge pull request eugenp#8083 from alimate/BAEL-3334

[BAEL 3334] Open Session in View Code

Author: sjmillington

persistence-modules/spring-data-jpa-3/pom.xml

@@ -18,29 +18,22 @@
     <dependencies>
 
         <!-- Prod Dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${postgresql.version}</version>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+            <version>${h2.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>${testcontainers.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${testcontainers.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -71,8 +64,7 @@
     </dependencies>
 
     <properties>
-        <testcontainers.version>1.12.2</testcontainers.version>
-        <postgresql.version>42.2.8</postgresql.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/tx/Payment.java renamed to persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/Payment.java

@@ -1,4 +1,4 @@
-package com.baeldung.tx;
+package com.baeldung.model;
 
 import javax.persistence.*;
 

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/model/User.java

@@ -0,0 +1,42 @@
+package com.baeldung.model;
+
+import javax.persistence.*;
+import java.util.Set;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String username;
+
+    @ElementCollection
+    private Set<String> permissions;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Set<String> getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(Set<String> permissions) {
+        this.permissions = permissions;
+    }
+}

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/repository/UserRepository.java

@@ -0,0 +1,17 @@
+package com.baeldung.repository;
+
+import com.baeldung.model.User;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface UserRepository extends JpaRepository<User, Long> {
+
+    @EntityGraph(attributePaths = "permissions")
+    Optional<User> findDetailedByUsername(String username);
+
+    Optional<User> findSummaryByUsername(String username);
+
+    Optional<User> findByUsername(String username);
+}

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/SimpleUserService.java

@@ -0,0 +1,24 @@
+package com.baeldung.service;
+
+import com.baeldung.model.User;
+import com.baeldung.repository.UserRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
+
+@Service
+public class SimpleUserService implements UserService {
+
+    private final UserRepository userRepository;
+
+    public SimpleUserService(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public Optional<User> findOne(String username) {
+        return userRepository.findDetailedByUsername(username);
+    }
+}

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/service/UserService.java

@@ -0,0 +1,9 @@
+package com.baeldung.service;
+
+import com.baeldung.model.User;
+
+import java.util.Optional;
+
+public interface UserService {
+    Optional<User> findOne(String username);
+}

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/web/DetailedUserDto.java

@@ -0,0 +1,45 @@
+package com.baeldung.web;
+
+import com.baeldung.model.User;
+
+import java.util.Set;
+
+public class DetailedUserDto {
+
+    private Long id;
+    private String username;
+    private Set<String> permissions;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Set<String> getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(Set<String> permissions) {
+        this.permissions = permissions;
+    }
+
+    public static DetailedUserDto fromEntity(User user) {
+        DetailedUserDto detailed = new DetailedUserDto();
+        detailed.setId(user.getId());
+        detailed.setUsername(user.getUsername());
+        detailed.setPermissions(user.getPermissions());
+
+        return detailed;
+    }
+}

persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/web/UserController.java

@@ -0,0 +1,27 @@
+package com.baeldung.web;
+
+import com.baeldung.service.UserService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/users")
+public class UserController {
+
+    private final UserService userService;
+
+    public UserController(UserService userService) {
+        this.userService = userService;
+    }
+
+    @GetMapping("/{username}")
+    public ResponseEntity<?> findOne(@PathVariable String username) {
+        return userService.findOne(username)
+                .map(DetailedUserDto::fromEntity)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
+    }
+}

persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/osiv/UserControllerIntegrationTest.java

@@ -0,0 +1,54 @@
+package com.baeldung.osiv;
+
+import com.baeldung.model.User;
+import com.baeldung.repository.UserRepository;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.MockMvc;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@ActiveProfiles("test")
+class UserControllerIntegrationTest {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    void setUp() {
+        User user = new User();
+        user.setUsername("root");
+        user.setPermissions(new HashSet<>(Arrays.asList("PERM_READ", "PERM_WRITE")));
+
+        userRepository.save(user);
+    }
+
+    @Test
+    void givenTheUserExists_WhenOsivIsEnabled_ThenLazyInitWorkEverywhere() throws Exception {
+        mockMvc.perform(get("/users/root"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.username").value("root"))
+                .andExpect(jsonPath("$.permissions", containsInAnyOrder("PERM_READ", "PERM_WRITE")));
+    }
+
+    @AfterEach
+    void flushDb() {
+        userRepository.deleteAll();
+    }
+}

persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/tx/ManualTransactionIntegrationTest.java

@@ -1,10 +1,10 @@
 package com.baeldung.tx;
 
+import com.baeldung.model.Payment;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -14,27 +14,17 @@
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import javax.persistence.EntityManager;
 
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace.NONE;
 import static org.springframework.transaction.annotation.Propagation.NOT_SUPPORTED;
 
 @DataJpaTest
-@Testcontainers
 @ActiveProfiles("test")
-@AutoConfigureTestDatabase(replace = NONE)
 @Transactional(propagation = NOT_SUPPORTED)
 class ManualTransactionIntegrationTest {
 
-    @Container
-    private static PostgreSQLContainer<?> pg = initPostgres();
-
     @Autowired
     private PlatformTransactionManager transactionManager;
 
@@ -159,13 +149,4 @@ void givenAPayment_WhenUsingTxManager_ThenShouldCommit() {
                 .getResultList()).hasSize(1);
     }
 
-    private static PostgreSQLContainer<?> initPostgres() {
-        PostgreSQLContainer<?> pg = new PostgreSQLContainer<>("postgres:11.1")
-                .withDatabaseName("baeldung")
-                .withUsername("test")
-                .withPassword("test");
-        pg.setPortBindings(singletonList("54320:5432"));
-
-        return pg;
-    }
 }