Spring-2019-11 lessons 8-9 examples updated

2026-05-30 10:50:42 +00:00 · 2019-12-24 20:39:46 +04:00
parent d1ee9a2d66
commit f14946bd8a
181 changed files with 2564 additions and 1195 deletions
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>ru.otus</groupId>
+    <artifactId>demo-projects</artifactId>
+    <version>1.0</version>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>spring-jdbc-demo</module>
+        <module>mybatis-demo</module>
+    </modules>
+</project>
@@ -29,6 +29,7 @@ class OtusStudentRepositoryJdbcImplTest {
                .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0)
                .allMatch(s -> s.getAvatar() != null)
                .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0);
+        students.forEach(System.out::println);

    }
 }
@@ -1,2 +0,0 @@
-# orm-demo
-Пример работы с БД через ORM
@@ -1,44 +0,0 @@
-package ru.otus.example.ormdemo.models;
-
-import lombok.*;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import ru.otus.example.ormdemo.models.common.Avatar;
-import ru.otus.example.ormdemo.models.common.Course;
-import ru.otus.example.ormdemo.models.common.EMail;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "otus_students")
-@NamedEntityGraph(name = "OtusStudentWithAvatarAndEmails",
-        attributeNodes = {@NamedAttributeNode(value = "avatar"),
-                @NamedAttributeNode(value = "emails")})
-public class OtusStudentV2 {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private long id;
-
-    @Column(name = "name", nullable = false, unique = true)
-    private String name;
-
-    @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL)
-    @JoinColumn(name = "avatar_id")
-    private Avatar avatar;
-
-    @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL)
-    @JoinColumn(name = "student_id")
-    private List<EMail> emails;
-
-    //@Fetch(FetchMode.SUBSELECT)
-    //@BatchSize(size = 5)
-    @ManyToMany(targetEntity = Course.class, fetch = FetchType.LAZY)
-    @JoinTable(name = "student_courses", joinColumns = @JoinColumn(name = "student_id"),
-            inverseJoinColumns = @JoinColumn(name = "course_id"))
-    private List<Course> courses;
-}
@@ -1,7 +0,0 @@
-package ru.otus.example.ormdemo.repositories;
-
-import ru.otus.example.ormdemo.models.common.Course;
-
-public interface CourseRepositoryJpa {
-    Course save(Course course);
-}
@@ -1,18 +0,0 @@
-package ru.otus.example.ormdemo.repositories;
-
-import ru.otus.example.ormdemo.models.common.Course;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-public class CourseRepositoryJpaImpl implements CourseRepositoryJpa {
-
-    @PersistenceContext
-    private EntityManager em;
-
-    @Override
-    public Course save(Course course) {
-        em.persist(course);
-        return course;
-    }
-}
@@ -1,11 +0,0 @@
-package ru.otus.example.ormdemo.repositories;
-
-
-import ru.otus.example.ormdemo.models.OtusStudentV2;
-
-import java.util.List;
-
-public interface OtusStudentV2RepositoryJpa {
-    List<OtusStudentV2> findAllWithEntityGraph();
-    List<OtusStudentV2> findAllWithJoinFetch();
-}
@@ -1,30 +0,0 @@
-package ru.otus.example.ormdemo.repositories;
-
-import org.springframework.stereotype.Repository;
-import ru.otus.example.ormdemo.models.OtusStudentV2;
-
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-import java.util.List;
-
-@Repository
-public class OtusStudentV2RepositoryJpaImpl implements OtusStudentV2RepositoryJpa {
-
-    @PersistenceContext
-    private EntityManager em;
-
-    @Override
-    public List<OtusStudentV2> findAllWithEntityGraph() {
-        EntityGraph<?> entityGraph = em.getEntityGraph("OtusStudentWithAvatarAndEmails");
-        TypedQuery<OtusStudentV2> query = em.createQuery("select s from OtusStudentV2 s", OtusStudentV2.class);
-        query.setHint("javax.persistence.fetchgraph", entityGraph);
-        return query.getResultList();
-    }
-
-    @Override
-    public List<OtusStudentV2> findAllWithJoinFetch() {
-        return em.createQuery("select distinct s from OtusStudentV2 s join fetch s.avatar join fetch s.emails", OtusStudentV2.class).getResultList();
-    }
-}
@@ -1,74 +0,0 @@
-package ru.otus.example.ormdemo.repositories;
-
-import org.hibernate.SessionFactory;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.context.annotation.Import;
-import ru.otus.example.ormdemo.models.OtusStudentV2;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@DisplayName("Репозиторий v2 на основе Jpa для работы со студентами ")
-@DataJpaTest
-@Import({OtusStudentV2RepositoryJpaImpl.class})
-class OtusStudentV2RepositoryJpaImplTest {
-
-    private static final int EXPECTED_NUMBER_OF_STUDENTS = 10;
-
-    private static final int EXPECTED_QUERIES_COUNT = 11;  // EntityGraph/join fetch
-    //private static final int EXPECTED_QUERIES_COUNT = 2; // EntityGraph/join fetch + @Fetch(FetchMode.SUBSELECT)
-    //private static final int EXPECTED_QUERIES_COUNT = 3; // EntityGraph/join fetch + @BatchSize(size = 5)
-
-    @Autowired
-    private OtusStudentV2RepositoryJpaImpl repositoryJpa;
-
-    @Autowired
-    private TestEntityManager em;
-
-    private SessionFactory sessionFactory;
-
-    @BeforeEach
-    void setUp() {
-        sessionFactory = em.getEntityManager().getEntityManagerFactory()
-                .unwrap(SessionFactory.class);
-        sessionFactory.getStatistics().setStatisticsEnabled(true);
-        sessionFactory.getStatistics().clear();
-    }
-
-    @DisplayName(" с помощью EntityGraph должен загружать список всех студентов с полной информацией о них")
-    @Test
-    void usingEntityGraphShouldReturnCorrectStudentsListWithWithAllInfo() {
-        System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------");
-        List<OtusStudentV2> students = repositoryJpa.findAllWithEntityGraph();
-        assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS)
-                .allMatch(s -> !s.getName().equals(""))
-                .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0)
-                .allMatch(s -> s.getAvatar() != null)
-                .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0);
-        System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n");
-        assertThat(sessionFactory.getStatistics().getPrepareStatementCount())
-                .isEqualTo(EXPECTED_QUERIES_COUNT);
-
-    }
-
-    @DisplayName(" с помощью 'join fetch' должен загружать список всех студентов с полной информацией о них")
-    @Test
-    void usingJoinFetchShouldReturnCorrectStudentsListWithWithAllInfo() {
-        System.out.println("\n\n\n\n----------------------------------------------------------------------------------------------------------");
-        List<OtusStudentV2> students = repositoryJpa.findAllWithJoinFetch();
-        assertThat(students).isNotNull().hasSize(EXPECTED_NUMBER_OF_STUDENTS)
-                .allMatch(s -> !s.getName().equals(""))
-                .allMatch(s -> s.getCourses() != null && s.getCourses().size() > 0)
-                .allMatch(s -> s.getAvatar() != null)
-                .allMatch(s -> s.getEmails() != null && s.getEmails().size() > 0);
-        System.out.println("----------------------------------------------------------------------------------------------------------\n\n\n\n");
-        assertThat(sessionFactory.getStatistics().getPrepareStatementCount())
-                .isEqualTo(EXPECTED_QUERIES_COUNT);
-    }
-}
@@ -9,10 +9,9 @@
        <relativePath/>
    </parent>
    <groupId>ru.otus.example</groupId>
-    <artifactId>orm-demo</artifactId>
+    <artifactId>orm-exercise</artifactId>
+    <name>orm-exercise</name>
    <version>0.0.1-SNAPSHOT</version>
-    <name>orm-demo</name>
-    <description>Orm demo</description>

    <properties>
        <java.version>11</java.version>
@@ -29,7 +28,7 @@
        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
+            <version>1.4.200</version>
        </dependency>

        <dependency>
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.SQLException;
+
+@SpringBootApplication
+public class OrmDemoApplication {
+
+	public static void main(String[] args) throws SQLException {
+		SpringApplication.run(OrmDemoApplication.class, args);
+		Console.main(args);
+	}
+
+}
@@ -0,0 +1,15 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Avatar {
+    private long id;
+    private String photoUrl;
+}
@@ -0,0 +1,15 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Course {
+    private long id;
+    private String name;
+}
@@ -0,0 +1,15 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EMail {
+    private long id;
+    private String email;
+}
@@ -0,0 +1,18 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OtusStudent {
+    private long id;
+    private String name;
+
+    //private Avatar avatar;
+    //private List<EMail> emails;
+    //private List<Course> courses;
+}
@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: never
+
+  jpa:
+    generate-ddl: true
+    hibernate:
+      ddl-auto: create
+
+    properties:
+      hibernate:
+        format_sql: true
+
+    show-sql: true
+
+
+logging:
+  level:
+    ROOT: ERROR
@@ -9,10 +9,9 @@
        <relativePath/>
    </parent>
    <groupId>ru.otus.example</groupId>
-    <artifactId>replace-orm-provider-demo</artifactId>
+    <artifactId>orm-solution-01</artifactId>
+    <name>orm-solution-01</name>
    <version>0.0.1-SNAPSHOT</version>
-    <name>replace-orm-provider-demo</name>
-    <description>Replace ORM provider demo</description>

    <properties>
        <java.version>11</java.version>
@@ -24,28 +23,12 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>2.7.4</version>
        </dependency>

        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
+            <version>1.4.200</version>
        </dependency>

        <dependency>
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.SQLException;
+
+@SpringBootApplication
+public class OrmDemoApplication {
+
+	public static void main(String[] args) throws SQLException {
+		SpringApplication.run(OrmDemoApplication.class, args);
+		Console.main(args);
+	}
+
+}
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+public class Avatar {
+    @Id
+    private long id;
+    private String photoUrl;
+}
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+public class Course {
+    @Id
+    private long id;
+    private String name;
+}
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+public class EMail {
+    @Id
+    private long id;
+    private String email;
+}
@@ -0,0 +1,20 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity // Указывает, что данный класс является сущностью
+public class OtusStudent {
+    @Id // Позволяет указать какое поле является идентификатором
+    private long id;
+    private String name;
+
+    //private Avatar avatar;
+    //private List<EMail> emails;
+    //private List<Course> courses;
+}
@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: never
+
+  jpa:
+    generate-ddl: true
+    hibernate:
+      ddl-auto: create
+
+    properties:
+      hibernate:
+        format_sql: true
+
+    show-sql: true
+
+
+logging:
+  level:
+    ROOT: ERROR
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.1.RELEASE</version>
+        <relativePath/>
+    </parent>
+    <groupId>ru.otus.example</groupId>
+    <artifactId>orm-solution-02</artifactId>
+    <name>orm-solution-02</name>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <properties>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--Тестирование-->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.SQLException;
+
+@SpringBootApplication
+public class OrmDemoApplication {
+
+	public static void main(String[] args) throws SQLException {
+		SpringApplication.run(OrmDemoApplication.class, args);
+		Console.main(args);
+	}
+
+}
@@ -0,0 +1,20 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "avatars")
+public class Avatar {
+    @Id
+    private long id;
+
+    @Column(name = "photo_url")
+    private String photoUrl;
+}
@@ -0,0 +1,20 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "courses")
+public class Course {
+    @Id
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "emails")
+public class EMail {
+
+    @Id
+    private long id;
+
+    @Column(name = "email")
+    private String email;
+}
@@ -0,0 +1,24 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity // Указывает, что данный класс является сущностью
+@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность
+public class OtusStudent {
+    @Id // Позволяет указать какое поле является идентификатором
+    private long id;
+
+    // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности
+    @Column(name = "name")
+    private String name;
+
+    //private Avatar avatar;
+    //private List<EMail> emails;
+    //private List<Course> courses;
+}
@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: never
+
+  jpa:
+    generate-ddl: true
+    hibernate:
+      ddl-auto: create
+
+    properties:
+      hibernate:
+        format_sql: true
+
+    show-sql: true
+
+
+logging:
+  level:
+    ROOT: ERROR
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.1.RELEASE</version>
+        <relativePath/>
+    </parent>
+    <groupId>ru.otus.example</groupId>
+    <artifactId>orm-solution-03</artifactId>
+    <name>orm-solution-03</name>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <properties>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--Тестирование-->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.SQLException;
+
+@SpringBootApplication
+public class OrmDemoApplication {
+
+	public static void main(String[] args) throws SQLException {
+		SpringApplication.run(OrmDemoApplication.class, args);
+		Console.main(args);
+	}
+
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "avatars")
+public class Avatar {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "photo_url")
+    private String photoUrl;
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "courses")
+public class Course {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+}
@@ -0,0 +1,22 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "emails")
+public class EMail {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "email")
+    private String email;
+}
@@ -0,0 +1,25 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity // Указывает, что данный класс является сущностью
+@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность
+public class OtusStudent {
+    @Id // Позволяет указать какое поле является идентификатором
+    @GeneratedValue(strategy = GenerationType.IDENTITY) // Позволяет указат стратегию генерации id
+    private long id;
+
+    // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности
+    @Column(name = "name")
+    private String name;
+
+    //private Avatar avatar;
+    //private List<EMail> emails;
+    //private List<Course> courses;
+}
@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: never
+
+  jpa:
+    generate-ddl: true
+    hibernate:
+      ddl-auto: create
+
+    properties:
+      hibernate:
+        format_sql: true
+
+    show-sql: true
+
+
+logging:
+  level:
+    ROOT: ERROR
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.1.RELEASE</version>
+        <relativePath/>
+    </parent>
+    <groupId>ru.otus.example</groupId>
+    <artifactId>orm-solution-04</artifactId>
+    <name>orm-solution-04</name>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <properties>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--Тестирование-->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.SQLException;
+
+@SpringBootApplication
+public class OrmDemoApplication {
+
+	public static void main(String[] args) throws SQLException {
+		SpringApplication.run(OrmDemoApplication.class, args);
+		Console.main(args);
+	}
+
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "avatars")
+public class Avatar {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "photo_url")
+    private String photoUrl;
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "courses")
+public class Course {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+}
@@ -0,0 +1,22 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "emails")
+public class EMail {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "email")
+    private String email;
+}
@@ -0,0 +1,30 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity // Указывает, что данный класс является сущностью
+@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность
+public class OtusStudent {
+    @Id // Позволяет указать какое поле является идентификатором
+    @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов
+    private long id;
+
+    // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности
+    @Column(name = "name", nullable = false, unique = true)
+    private String name;
+
+    // Указывает на связь между таблицами "один к одному"
+    @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL)
+    // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности
+    @JoinColumn(name = "avatar_id")
+    private Avatar avatar;
+
+    //private List<EMail> emails;
+    //private List<Course> courses;
+}
@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: never
+
+  jpa:
+    generate-ddl: true
+    hibernate:
+      ddl-auto: create
+
+    properties:
+      hibernate:
+        format_sql: true
+
+    show-sql: true
+
+
+logging:
+  level:
+    ROOT: ERROR
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.1.RELEASE</version>
+        <relativePath/>
+    </parent>
+    <groupId>ru.otus.example</groupId>
+    <artifactId>orm-solution-05</artifactId>
+    <name>orm-solution-05</name>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <properties>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--Тестирование-->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.SQLException;
+
+@SpringBootApplication
+public class OrmDemoApplication {
+
+	public static void main(String[] args) throws SQLException {
+		SpringApplication.run(OrmDemoApplication.class, args);
+		Console.main(args);
+	}
+
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "avatars")
+public class Avatar {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "photo_url")
+    private String photoUrl;
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "courses")
+public class Course {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+}
@@ -0,0 +1,22 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "emails")
+public class EMail {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "email")
+    private String email;
+}
@@ -0,0 +1,34 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity // Указывает, что данный класс является сущностью
+@Table(name = "otus_students") // Задает имя таблицы, на которую будет отображаться сущность
+public class OtusStudent {
+    @Id // Позволяет указать какое поле является идентификатором
+    @GeneratedValue(strategy = GenerationType.IDENTITY) // Стратегия генерации идентификаторов
+    private long id;
+
+    // Задает имя и некоторые свойства поля таблицы, на которое будет отображаться поле сущности
+    @Column(name = "name", nullable = false, unique = true)
+    private String name;
+
+    // Указывает на связь между таблицами "один к одному"
+    @OneToOne(targetEntity = Avatar.class, cascade = CascadeType.ALL)
+    // Задает поле, по которому происходит объединение с таблицей для хранения связанной сущности
+    @JoinColumn(name = "avatar_id")
+    private Avatar avatar;
+
+    // Указывает на связь между таблицами "один ко многим"
+    @OneToMany(targetEntity = EMail.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "student_id")
+    private List<EMail> emails;
+
+    //private List<Course> courses;
+}
@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: never
+
+  jpa:
+    generate-ddl: true
+    hibernate:
+      ddl-auto: create
+
+    properties:
+      hibernate:
+        format_sql: true
+
+    show-sql: true
+
+
+logging:
+  level:
+    ROOT: ERROR
@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.1.RELEASE</version>
+        <relativePath/>
+    </parent>
+    <groupId>ru.otus.example</groupId>
+    <artifactId>orm-solution-final</artifactId>
+    <name>orm-solution-final</name>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <properties>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--Тестирование-->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,17 @@
+package ru.otus.example.ormdemo;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.SQLException;
+
+@SpringBootApplication
+public class OrmDemoApplication {
+
+	public static void main(String[] args) throws SQLException {
+		SpringApplication.run(OrmDemoApplication.class, args);
+		Console.main(args);
+	}
+
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "avatars")
+public class Avatar {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "photo_url")
+    private String photoUrl;
+}
@@ -0,0 +1,21 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "courses")
+public class Course {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+}
@@ -0,0 +1,22 @@
+package ru.otus.example.ormdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "emails")
+public class EMail {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "email")
+    private String email;
+}
@@ -1,9 +1,6 @@
 package ru.otus.example.ormdemo.models;

 import lombok.*;
-import ru.otus.example.ormdemo.models.common.Avatar;
-import ru.otus.example.ormdemo.models.common.Course;
-import ru.otus.example.ormdemo.models.common.EMail;

 import javax.persistence.*;
 import java.util.List;
@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: never
+
+  jpa:
+    generate-ddl: true
+    hibernate:
+      ddl-auto: create
+
+    properties:
+      hibernate:
+        format_sql: true
+
+    show-sql: true
+
+
+logging:
+  level:
+    ROOT: ERROR
@@ -11,9 +11,12 @@
    <packaging>pom</packaging>

    <modules>
-        <module>spring-jdbc-demo</module>
-        <module>orm-demo</module>
-		<module>replace-orm-provider-demo</module>
-        <module>mybatis-demo</module>
+        <module>orm-exercise</module>
+        <module>orm-solution-01</module>
+        <module>orm-solution-02</module>
+        <module>orm-solution-03</module>
+        <module>orm-solution-04</module>
+        <module>orm-solution-05</module>
+        <module>orm-solution-final</module>
    </modules>
 </project>
--- a/Show More
+++ b/Show More