Merge branch 'master' of https://github.com/OtusTeam/Spring

2026-06-20 11:14:34 +00:00 · 2021-04-28 19:39:18 +03:00
parent 68d1dab090 ba8eb6c5b5
commit 0aa9692a13
300 changed files with 8680 additions and 7 deletions
@@ -15,8 +15,8 @@
    </parent>

    <properties>
-        <maven.compiler.source>14</maven.compiler.source>
-        <maven.compiler.target>14</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
    </properties>

    <dependencies>
@@ -15,8 +15,8 @@
    </parent>

    <properties>
-        <maven.compiler.source>14</maven.compiler.source>
-        <maven.compiler.target>14</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
    </properties>

    <dependencies>
@@ -0,0 +1,30 @@
+target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+
+node/
+/node_modules
+/output
+package-lock.json
@@ -0,0 +1,26 @@
+{
+  "name": "client",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "webpack-dev-server --config webpack.dev.config.js",
+    "build": "webpack"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0"
+  },
+  "devDependencies": {
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.2",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
+    "html-webpack-plugin": "^3.2.0",
+    "webpack": "^3.10.0",
+    "webpack-cli": "^3.2.3",
+    "webpack-dev-server": "^2.9.7"
+  }
+}
@@ -0,0 +1,88 @@
+<?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>spring-17-boot-and-react</artifactId>
+    <version>1.0</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.4.RELEASE</version>
+    </parent>
+
+    <properties>
+        <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</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <configuration>
+                            <nodeVersion>v10.15.1</nodeVersion>
+                            <npmVersion>6.4.1</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm run build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,27 @@
+package ru.otus.spring;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import ru.otus.spring.domain.Person;
+import ru.otus.spring.repostory.PersonRepository;
+
+import javax.annotation.PostConstruct;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Main.class);
+    }
+
+    @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection")
+    @Autowired
+    private PersonRepository repository;
+
+    @PostConstruct
+    public void init() {
+        repository.save(new Person("Pushkin"));
+        repository.save(new Person("Lermontov"));
+    }
+}
@@ -0,0 +1,37 @@
+package ru.otus.spring.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Person {
+
+    @Id
+    @GeneratedValue
+    private int id;
+    private String name;
+
+    public Person() {
+    }
+
+    public Person(String name) {
+        this.name = name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
@@ -0,0 +1,11 @@
+package ru.otus.spring.repostory;
+
+import org.springframework.data.repository.CrudRepository;
+import ru.otus.spring.domain.Person;
+
+import java.util.List;
+
+public interface PersonRepository extends CrudRepository<Person, Integer> {
+
+    List<Person> findAll();
+}
@@ -0,0 +1,30 @@
+package ru.otus.spring.rest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.otus.spring.domain.Person;
+import ru.otus.spring.repostory.PersonRepository;
+import ru.otus.spring.rest.dto.PersonDto;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+public class PersonController {
+
+    private final PersonRepository repository;
+
+    @Autowired
+    public PersonController(PersonRepository repository) {
+        this.repository = repository;
+    }
+
+    @GetMapping("/api/persons")
+    public List<PersonDto> getAllPersons() {
+        return repository.findAll().stream().map(PersonDto::toDto)
+                .collect(Collectors.toList());
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016 Russian Post
+ *
+ * This source code is Russian Post Confidential Proprietary.
+ * This software is protected by copyright. All rights and titles are reserved.
+ * You shall not use, copy, distribute, modify, decompile, disassemble or reverse engineer the software.
+ * Otherwise this violation would be treated by law and would be subject to legal prosecution.
+ * Legal use of the software provides receipt of a license from the right name only.
+ */
+package ru.otus.spring.rest.dto;
+
+import ru.otus.spring.domain.Person;
+
+/**
+ * DTO that represents Account
+ */
+@SuppressWarnings("all")
+public class PersonDto {
+
+    private int id = -1;
+    private String name;
+
+    public PersonDto() {
+    }
+
+    public PersonDto(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public static PersonDto toDto(Person person) {
+        return new PersonDto(person.getId(), person.getName());
+    }
+}
@@ -0,0 +1,45 @@
+import React from 'react'
+
+const Header = (props) => (
+    <h1>{props.title}</h1>
+);
+
+export default class App extends React.Component {
+
+    constructor() {
+        super();
+        this.state = {persons: []};
+    }
+
+    componentDidMount() {
+        fetch('/api/persons')
+            .then(response => response.json())
+            .then(persons => this.setState({persons}));
+    }
+
+    render() {
+        return (
+            <React.Fragment>
+                <Header title={'Persons'}/>
+                <table>
+                    <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>Name</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {
+                        this.state.persons.map((person, i) => (
+                            <tr key={i}>
+                                <td>{person.id}</td>
+                                <td>{person.name}</td>
+                            </tr>
+                        ))
+                    }
+                    </tbody>
+                </table>
+            </React.Fragment>
+        )
+    }
+};
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <title>Minimal React Boilerplate</title>
+  </head>
+    <body>
+      <noscript>
+        You need to enable JavaScript to run this app.
+      </noscript>
+
+      <div id="root"></div>
+
+      <script src="./bundle.js" type="text/javascript"></script>
+    </body>
+</html>
@@ -0,0 +1,9 @@
+import React from 'react'
+import ReactDOM from 'react-dom'
+
+import App from './components/App'
+
+ReactDOM.render(
+  <App />,
+  document.getElementById('root')
+)
@@ -0,0 +1,47 @@
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+    entry: './src/ui/index.js',
+    output: {
+        path: path.resolve(__dirname, 'target/classes/public/'),
+        filename: 'bundle.min.js',
+        libraryTarget: 'umd'
+    },
+
+    module: {
+        loaders: [
+            {
+                test: /\.js$/,
+                exclude: /(node_modules|bower_components|build)/,
+                use: {
+                    loader: 'babel-loader',
+                    options: {
+                        presets: ['env', 'react']
+                    }
+                }
+            }
+        ]
+    },
+
+    plugins: [
+        new webpack.DefinePlugin({
+            "process.env": {
+                NODE_ENV: JSON.stringify("production")
+            }
+        }),
+        new webpack.optimize.UglifyJsPlugin({
+            compress: {
+                warnings: false,
+            },
+            output: {
+                comments: false,
+            },
+        }),
+        new HtmlWebpackPlugin({
+            filename: 'index.html',
+            template: 'src/ui/index.html'
+        })
+    ]
+}
@@ -0,0 +1,46 @@
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const path = require('path');
+
+module.exports = {
+    entry: './src/ui/index.js',
+    devtool: 'inline-source-map',
+    output: {
+        path: path.resolve(__dirname),
+        filename: 'bundle.js',
+        libraryTarget: 'umd'
+    },
+
+    devServer: {
+        contentBase: path.resolve(__dirname) + '/src/ui',
+        compress: true,
+        port: 9000,
+        host: 'localhost',
+        open: true,
+        before: (app) => {
+            app.get('/api/persons', (req, res) => res.send([
+                {id: '1', name: 'Привяу'}
+            ]));
+        }
+    },
+
+    module: {
+        loaders: [
+            {
+                test: /\.js$/,
+                exclude: /(node_modules|bower_components|build)/,
+                use: {
+                    loader: 'babel-loader',
+                    options: {
+                        presets: ['env', 'react']
+                    }
+                }
+            }
+        ]
+    },
+    plugins: [
+        new HtmlWebpackPlugin({
+            filename: 'index.html',
+            template: 'src/ui/index.html'
+        })
+    ]
+}
@@ -0,0 +1,24 @@
+target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
@@ -0,0 +1,60 @@
+<?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>spring-17-jquery</artifactId>
+    <version>1.0</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.4.RELEASE</version>
+    </parent>
+
+    <properties>
+        <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</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,27 @@
+package ru.otus.spring;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import ru.otus.spring.domain.Person;
+import ru.otus.spring.repostory.PersonRepository;
+
+import javax.annotation.PostConstruct;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Main.class);
+    }
+
+    @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection")
+    @Autowired
+    private PersonRepository repository;
+
+    @PostConstruct
+    public void init() {
+        repository.save(new Person("Pushkin"));
+        repository.save(new Person("Lermontov"));
+    }
+}
@@ -0,0 +1,37 @@
+package ru.otus.spring.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Person {
+
+    @Id
+    @GeneratedValue
+    private int id;
+    private String name;
+
+    public Person() {
+    }
+
+    public Person(String name) {
+        this.name = name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
@@ -0,0 +1,15 @@
+package ru.otus.spring.page;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class PersonPagesController {
+
+    @GetMapping("/")
+    public String listPage(Model model) {
+        model.addAttribute("keywords", "list users in Omsk, omsk, list users, list users free");
+        return "list";
+    }
+}
@@ -0,0 +1,11 @@
+package ru.otus.spring.repostory;
+
+import org.springframework.data.repository.CrudRepository;
+import ru.otus.spring.domain.Person;
+
+import java.util.List;
+
+public interface PersonRepository extends CrudRepository<Person, Integer> {
+
+    List<Person> findAll();
+}
@@ -0,0 +1,30 @@
+package ru.otus.spring.rest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.otus.spring.domain.Person;
+import ru.otus.spring.repostory.PersonRepository;
+import ru.otus.spring.rest.dto.PersonDto;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+public class PersonController {
+
+    private final PersonRepository repository;
+
+    @Autowired
+    public PersonController(PersonRepository repository) {
+        this.repository = repository;
+    }
+
+    @GetMapping("/api/persons")
+    public List<PersonDto> getAllPersons() {
+        return repository.findAll().stream().map(PersonDto::toDto)
+                .collect(Collectors.toList());
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016 Russian Post
+ *
+ * This source code is Russian Post Confidential Proprietary.
+ * This software is protected by copyright. All rights and titles are reserved.
+ * You shall not use, copy, distribute, modify, decompile, disassemble or reverse engineer the software.
+ * Otherwise this violation would be treated by law and would be subject to legal prosecution.
+ * Legal use of the software provides receipt of a license from the right name only.
+ */
+package ru.otus.spring.rest.dto;
+
+import ru.otus.spring.domain.Person;
+
+/**
+ * DTO that represents Account
+ */
+@SuppressWarnings("all")
+public class PersonDto {
+
+    private int id = -1;
+    private String name;
+
+    public PersonDto() {
+    }
+
+    public PersonDto(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public static PersonDto toDto(Person person) {
+        return new PersonDto(person.getId(), person.getName());
+    }
+}
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+    <meta name="keywords" th:content="${keywords}"/>
+    <title>List of all persons</title>
+    <style type="text/css">
+        body {
+            padding: 50px;
+        }
+
+        .persons, .persons td {
+            border: 1px solid lightgray;
+            padding: 5px;
+        }
+    </style>
+    <script src="/webjars/jquery/3.3.1/jquery.min.js"></script>
+</head>
+<body>
+<h1>Persons:</h1>
+
+<table class="persons">
+    <thead>
+    <tr>
+        <th>ID</th>
+        <th>Name</th>
+    </tr>
+    </thead>
+    <tbody>
+    </tbody>
+</table>
+<script>
+    $(function () {
+        $.get('/api/persons').done(function (persons) {
+            persons.forEach(function (person) {
+                $('tbody').append(`
+                    <tr>
+                        <td>${person.id}</td>
+                        <td>${person.name}</td>
+                    </tr>
+                `)
+            });
+        })
+    });
+</script>
+</body>
+</html>
@@ -0,0 +1,4 @@
+.idea/
+*.iml
+
+target/
@@ -0,0 +1,52 @@
+<?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>jdbc-demo-exercise</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.4</version>
+    </parent>
+
+    <properties>
+        <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</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,20 @@
+package ru.otus.spring;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import ru.otus.spring.dao.PersonDao;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) throws Exception {
+
+        ApplicationContext context = SpringApplication.run(Main.class);
+
+        PersonDao dao = context.getBean(PersonDao.class);
+
+        Console.main(args);
+    }
+}
@@ -0,0 +1,4 @@
+package ru.otus.spring.dao;
+
+public interface PersonDao {
+}
@@ -0,0 +1,15 @@
+package ru.otus.spring.dao;
+
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.stereotype.Repository;
+
+@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"})
+@Repository
+public class PersonDaoJdbc implements PersonDao {
+    private final JdbcOperations jdbc;
+
+    public PersonDaoJdbc(JdbcOperations jdbcOperations)
+    {
+        this.jdbc = jdbcOperations;
+    }
+}
@@ -0,0 +1,11 @@
+package ru.otus.spring.domain;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Data
+public class Person {
+    private final long id;
+    private final String name;
+}
@@ -0,0 +1,9 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+
+  h2:
+    console:
+      path: /h2-console
+      settings:
+        web-allow-others: true
@@ -0,0 +1 @@
+insert into persons (id, `name`) values (1, 'masha');
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS PERSONS;
+CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255));
@@ -0,0 +1,4 @@
+.idea/
+*.iml
+
+target/
@@ -0,0 +1,52 @@
+<?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>jdbc-demo-solution-3</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.4</version>
+    </parent>
+
+    <properties>
+        <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</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,23 @@
+package ru.otus.spring;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import ru.otus.spring.dao.PersonDao;
+import ru.otus.spring.domain.Person;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) throws Exception {
+
+        ApplicationContext context = SpringApplication.run(Main.class);
+
+        PersonDao dao = context.getBean(PersonDao.class);
+
+        System.out.println("All count " + dao.count());
+
+        Console.main(args);
+    }
+}
@@ -0,0 +1,6 @@
+package ru.otus.spring.dao;
+
+public interface PersonDao {
+
+    int count();
+}
@@ -0,0 +1,23 @@
+package ru.otus.spring.dao;
+
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.stereotype.Repository;
+import ru.otus.spring.domain.Person;
+
+@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"})
+@Repository
+public class PersonDaoJdbc implements PersonDao {
+
+    private final JdbcOperations jdbc;
+
+    public PersonDaoJdbc(JdbcOperations jdbcOperations)
+    {
+        this.jdbc = jdbcOperations;
+    }
+
+    @Override
+    public int count() {
+        return jdbc.queryForObject("select count(*) from persons", Integer.class);
+    }
+
+}
@@ -0,0 +1,11 @@
+package ru.otus.spring.domain;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Data
+public class Person {
+    private final long id;
+    private final String name;
+}
@@ -0,0 +1,9 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+
+  h2:
+    console:
+      path: /h2-console
+      settings:
+        web-allow-others: true
@@ -0,0 +1 @@
+insert into persons (id, `name`) values (1, 'masha');
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS PERSONS;
+CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255));
@@ -0,0 +1,4 @@
+.idea/
+*.iml
+
+target/
@@ -0,0 +1,52 @@
+<?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>jdbc-demo-solution-4</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.4</version>
+    </parent>
+
+    <properties>
+        <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</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,27 @@
+package ru.otus.spring;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import ru.otus.spring.dao.PersonDao;
+import ru.otus.spring.domain.Person;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) throws Exception {
+
+        ApplicationContext context = SpringApplication.run(Main.class);
+
+        PersonDao dao = context.getBean(PersonDao.class);
+
+        System.out.println("All count " + dao.count());
+
+        dao.insert(new Person(2, "ivan"));
+
+        System.out.println("All count " + dao.count());
+
+        Console.main(args);
+    }
+}
@@ -0,0 +1,12 @@
+package ru.otus.spring.dao;
+
+import ru.otus.spring.domain.Person;
+
+import java.util.List;
+
+public interface PersonDao {
+
+    int count();
+
+    void insert(Person person);
+}
@@ -0,0 +1,33 @@
+package ru.otus.spring.dao;
+
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Repository;
+import ru.otus.spring.domain.Person;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"})
+@Repository
+public class PersonDaoJdbc implements PersonDao {
+
+    private final JdbcOperations jdbc;
+
+    public PersonDaoJdbc(JdbcOperations jdbcOperations)
+    {
+        this.jdbc = jdbcOperations;
+    }
+
+    @Override
+    public int count() {
+        return jdbc.queryForObject("select count(*) from persons", Integer.class);
+    }
+
+    @Override
+    public void insert(Person person) {
+        jdbc.update("insert into persons (id, `name`) values (?, ?)", person.getId(), person.getName());
+    }
+
+}
@@ -0,0 +1,11 @@
+package ru.otus.spring.domain;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Data
+public class Person {
+    private final long id;
+    private final String name;
+}
@@ -0,0 +1,9 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+
+  h2:
+    console:
+      path: /h2-console
+      settings:
+        web-allow-others: true
@@ -0,0 +1 @@
+insert into persons (id, `name`) values (1, 'masha');
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS PERSONS;
+CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255));
@@ -0,0 +1,4 @@
+.idea/
+*.iml
+
+target/
@@ -0,0 +1,53 @@
+<?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>jdbc-demo-solution-5</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.4</version>
+    </parent>
+
+    <properties>
+        <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</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,31 @@
+package ru.otus.spring;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import ru.otus.spring.dao.PersonDao;
+import ru.otus.spring.domain.Person;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) throws Exception {
+
+        ApplicationContext context = SpringApplication.run(Main.class);
+
+        PersonDao dao = context.getBean(PersonDao.class);
+
+        System.out.println("All count " + dao.count());
+
+        dao.insert(new Person(2, "ivan"));
+
+        System.out.println("All count " + dao.count());
+
+        Person ivan = dao.getById(2);
+
+        System.out.println("Ivan id: " + ivan.getId() + " name: " + ivan.getName());
+
+        Console.main(args);
+    }
+}
@@ -0,0 +1,16 @@
+package ru.otus.spring.dao;
+
+import ru.otus.spring.domain.Person;
+
+import java.util.List;
+
+public interface PersonDao {
+
+    int count();
+
+    void insert(Person person);
+
+    Person getById(long id);
+
+    List<Person> getAll();
+}
@@ -0,0 +1,56 @@
+package ru.otus.spring.dao;
+
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
+import org.springframework.stereotype.Repository;
+import ru.otus.spring.domain.Person;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"})
+@Repository
+public class PersonDaoJdbc implements PersonDao {
+
+    private final JdbcOperations jdbc;
+
+    public PersonDaoJdbc(JdbcOperations jdbcOperations)
+    {
+        this.jdbc = jdbcOperations;
+    }
+
+    @Override
+    public int count() {
+        return jdbc.queryForObject("select count(*) from persons", Integer.class);
+    }
+
+    @Override
+    public void insert(Person person) {
+        jdbc.update("insert into persons (id, `name`) values (?, ?)", person.getId(), person.getName());
+    }
+
+    @Override
+    public Person getById(long id) {
+        return jdbc.queryForObject("select * from persons where id = ?", new Object[] {id}, new PersonMapper());
+    }
+
+    @Override
+    public List<Person> getAll() {
+        return jdbc.query("select * from persons", new PersonMapper());
+    }
+
+
+    private static class PersonMapper implements RowMapper<Person> {
+
+        @Override
+        public Person mapRow(ResultSet resultSet, int i) throws SQLException {
+            long id = resultSet.getLong("id");
+            String name = resultSet.getString("name");
+            return new Person(id, name);
+        }
+    }
+}
@@ -0,0 +1,11 @@
+package ru.otus.spring.domain;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Data
+public class Person {
+    private final long id;
+    private final String name;
+}
@@ -0,0 +1,9 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+
+  h2:
+    console:
+      path: /h2-console
+      settings:
+        web-allow-others: true
@@ -0,0 +1 @@
+insert into persons (id, `name`) values (1, 'masha');
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS PERSONS;
+CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255));
@@ -0,0 +1,4 @@
+.idea/
+*.iml
+
+target/
@@ -0,0 +1,58 @@
+<?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>jdbc-demo-solution-final</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.4</version>
+    </parent>
+
+    <properties>
+        <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</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <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,33 @@
+package ru.otus.spring;
+
+import org.h2.tools.Console;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import ru.otus.spring.dao.PersonDao;
+import ru.otus.spring.domain.Person;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) throws Exception {
+
+        ApplicationContext context = SpringApplication.run(Main.class);
+
+        PersonDao dao = context.getBean(PersonDao.class);
+
+        System.out.println("All count " + dao.count());
+
+        dao.insert(new Person(2, "ivan"));
+
+        System.out.println("All count " + dao.count());
+
+        Person ivan = dao.getById(2);
+
+        System.out.println("Ivan id: " + ivan.getId() + " name: " + ivan.getName());
+
+        System.out.println(dao.getAll());
+
+        Console.main(args);
+    }
+}
@@ -0,0 +1,18 @@
+package ru.otus.spring.dao;
+
+import ru.otus.spring.domain.Person;
+
+import java.util.List;
+
+public interface PersonDao {
+
+    int count();
+
+    void insert(Person person);
+
+    Person getById(long id);
+
+    List<Person> getAll();
+
+    void deleteById(long id);
+}
@@ -0,0 +1,71 @@
+package ru.otus.spring.dao;
+
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
+import org.springframework.stereotype.Repository;
+import ru.otus.spring.domain.Person;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"})
+@Repository
+public class PersonDaoJdbc implements PersonDao {
+
+    private final JdbcOperations jdbc;
+    private final NamedParameterJdbcOperations namedParameterJdbcOperations;
+
+    public PersonDaoJdbc(NamedParameterJdbcOperations namedParameterJdbcOperations)
+    {
+        // Это просто оставили, чтобы не переписывать код
+        // В идеале всё должно быть на NamedParameterJdbcOperations
+        this.jdbc = namedParameterJdbcOperations.getJdbcOperations();
+        this.namedParameterJdbcOperations = namedParameterJdbcOperations;
+    }
+
+    @Override
+    public int count() {
+        return jdbc.queryForObject("select count(*) from persons", Integer.class);
+    }
+
+    @Override
+    public void insert(Person person) {
+        namedParameterJdbcOperations.update("insert into persons (id, `name`) values (:id, :name)",
+                Map.of("id", person.getId(), "name", person.getName()));
+    }
+
+    @Override
+    public Person getById(long id) {
+        Map<String, Object> params = Collections.singletonMap("id", id);
+        return namedParameterJdbcOperations.queryForObject(
+                "select * from persons where id = :id", params, new PersonMapper()
+        );
+    }
+
+    @Override
+    public List<Person> getAll() {
+        return jdbc.query("select * from persons", new PersonMapper());
+    }
+
+    @Override
+    public void deleteById(long id) {
+        Map<String, Object> params = Collections.singletonMap("id", id);
+        namedParameterJdbcOperations.update(
+                "delete from persons where id = :id", params
+        );
+    }
+
+    private static class PersonMapper implements RowMapper<Person> {
+
+        @Override
+        public Person mapRow(ResultSet resultSet, int i) throws SQLException {
+            long id = resultSet.getLong("id");
+            String name = resultSet.getString("name");
+            return new Person(id, name);
+        }
+    }
+}
@@ -0,0 +1,11 @@
+package ru.otus.spring.domain;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Data
+public class Person {
+    private final long id;
+    private final String name;
+}
@@ -0,0 +1,9 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+
+  h2:
+    console:
+      path: /h2-console
+      settings:
+        web-allow-others: true
@@ -0,0 +1 @@
+insert into persons (id, `name`) values (1, 'masha');
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS PERSONS;
+CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255));
@@ -0,0 +1,93 @@
+package ru.otus.spring.dao;
+
+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.jdbc.JdbcTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.test.annotation.Commit;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.transaction.AfterTransaction;
+import org.springframework.test.context.transaction.BeforeTransaction;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import ru.otus.spring.domain.Person;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.*;
+
+@DisplayName("Dao для работы с пёрсонами должно")
+@JdbcTest
+@Import(PersonDaoJdbc.class)
+//@Transactional(propagation = Propagation.NOT_SUPPORTED)
+class PersonDaoJdbcTest {
+
+    private static final int EXPECTED_PERSONS_COUNT = 1;
+    private static final int EXISTING_PERSON_ID = 1;
+    private static final String EXISTING_PERSON_NAME = "Ivan";
+
+
+    @Autowired
+    private PersonDaoJdbc personDao;
+
+    @BeforeTransaction
+    void beforeTransaction(){
+        System.out.println("beforeTransaction");
+    }
+
+    @AfterTransaction
+    void afterTransaction(){
+        System.out.println("afterTransaction");
+    }
+
+    @DisplayName("возвращать ожидаемое количество пёрсонов в БД")
+    @Test
+    void shouldReturnExpectedPersonCount() {
+        int actualPersonsCount = personDao.count();
+        assertThat(actualPersonsCount).isEqualTo(EXPECTED_PERSONS_COUNT);
+    }
+
+    @Rollback(value = false)
+    //@Commit
+    @DisplayName("добавлять пёрсона в БД")
+    @Test
+    void shouldInsertPerson() {
+        Person expectedPerson = new Person(2, "Igor");
+        personDao.insert(expectedPerson);
+        Person actualPerson = personDao.getById(expectedPerson.getId());
+        assertThat(actualPerson).usingRecursiveComparison().isEqualTo(expectedPerson);
+    }
+
+    @DisplayName("возвращать ожидаемого пёрсона по его id")
+    @Test
+    void shouldReturnExpectedPersonById() {
+        Person expectedPerson = new Person(EXISTING_PERSON_ID, EXISTING_PERSON_NAME);
+        Person actualPerson = personDao.getById(expectedPerson.getId());
+        assertThat(actualPerson).usingRecursiveComparison().isEqualTo(expectedPerson);
+    }
+
+    @DisplayName("удалять заданного пёрсона по его id")
+    @Test
+    void shouldCorrectDeletePersonById() {
+        assertThatCode(() -> personDao.getById(EXISTING_PERSON_ID))
+                .doesNotThrowAnyException();
+
+        personDao.deleteById(EXISTING_PERSON_ID);
+
+        assertThatThrownBy(() -> personDao.getById(EXISTING_PERSON_ID))
+                .isInstanceOf(EmptyResultDataAccessException.class);
+    }
+
+    @DisplayName("возвращать ожидаемый список пёрсонов")
+    @Test
+    void shouldReturnExpectedPersonsList() {
+        Person expectedPerson = new Person(EXISTING_PERSON_ID, EXISTING_PERSON_NAME);
+        List<Person> actualPersonList = personDao.getAll();
+        assertThat(actualPersonList)
+                .usingFieldByFieldElementComparator()
+                .containsExactlyInAnyOrder(expectedPerson);
+    }
+
+}
@@ -0,0 +1,5 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: always
+    data: data.sql
@@ -0,0 +1 @@
+insert into persons (id, `name`) values (1, 'Ivan');
@@ -0,0 +1,20 @@
+<?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>jdbc-class-work</artifactId>
+    <version>1.0</version>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>jdbc-demo-exercise</module>
+        <module>jdbc-demo-solution-3</module>
+        <module>jdbc-demo-solution-4</module>
+        <module>jdbc-demo-solution-5</module>
+        <module>jdbc-demo-solution-final</module>
+    </modules>
+</project>
@@ -0,0 +1,4 @@
+.idea/
+*.iml
+
+target/
@@ -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,2 @@
+# mybatis-demo
+Пример работы с БД через MyBatis
@@ -0,0 +1,61 @@
+<?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.4.5</version>
+        <relativePath/>
+    </parent>
+    <groupId>ru.otus.example</groupId>
+    <artifactId>mybatis-demo</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>mybatis-demo</name>
+    <description>MyBatis demo</description>
+
+    <properties>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <mybatis.version>2.1.4</mybatis.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${mybatis.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </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>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,14 @@
+package ru.otus.example.mybatisdemo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+
+@SpringBootApplication
+public class MyBatisDemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(MyBatisDemoApplication.class, args);
+	}
+
+}
@@ -0,0 +1,13 @@
+package ru.otus.example.mybatisdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Avatar {
+    private long id;
+    private String photoUrl;
+}
@@ -0,0 +1,13 @@
+package ru.otus.example.mybatisdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Course {
+    private long id;
+    private String name;
+}
@@ -0,0 +1,13 @@
+package ru.otus.example.mybatisdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EMail {
+    private long id;
+    private String email;
+}
@@ -0,0 +1,18 @@
+package ru.otus.example.mybatisdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OtusStudent {
+    private long id;
+    private String name;
+    private Avatar avatar;
+    private List<EMail> emails;
+    private List<Course> courses;
+}
@@ -0,0 +1,18 @@
+package ru.otus.example.mybatisdemo.repositories;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import ru.otus.example.mybatisdemo.models.Avatar;
+
+@Mapper
+public interface AvatarRepository {
+    @Select("select * from avatars where id = #{id}")
+    @Results(value = {
+            @Result(property = "id", column = "id"),
+            @Result(property = "photoUrl", column = "photo_url")
+    })
+    Avatar getAvatarById(long id);
+
+}
@@ -0,0 +1,17 @@
+package ru.otus.example.mybatisdemo.repositories;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import ru.otus.example.mybatisdemo.models.Course;
+
+import java.util.List;
+
+@Mapper
+public interface CourseRepository {
+
+    @Select("select * " +
+            "from student_courses sc left join courses c on sc.course_id = c.id " +
+            "where sc.student_id = #{studentId}")
+    List<Course> getCoursesByStudentId(long studentId);
+
+}
@@ -0,0 +1,14 @@
+package ru.otus.example.mybatisdemo.repositories;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import ru.otus.example.mybatisdemo.models.EMail;
+
+import java.util.List;
+
+@Mapper
+public interface EmailRepository {
+
+    @Select("select * from emails where student_id = #{studentId}")
+    List<EMail> getEmailsByStudentId(long studentId);
+}
@@ -0,0 +1,42 @@
+package ru.otus.example.mybatisdemo.repositories;
+
+import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.mapping.FetchType;
+import ru.otus.example.mybatisdemo.models.Avatar;
+import ru.otus.example.mybatisdemo.models.OtusStudent;
+
+import java.util.List;
+
+@Mapper
+public interface OtusStudentRepository {
+
+    @Select("select * from otus_students")
+    @Results(id = "studentAllMap", value = {
+            @Result(property = "id", column = "id"),
+            @Result(property = "name", column = "name"),
+            @Result(property = "avatar", column = "avatar_id", javaType = Avatar.class,
+                    one = @One(select = "ru.otus.example.mybatisdemo.repositories.AvatarRepository.getAvatarById", fetchType = FetchType.EAGER)),
+            @Result(property = "emails", column = "id", javaType = List.class,
+                    many = @Many(select = "ru.otus.example.mybatisdemo.repositories.EmailRepository.getEmailsByStudentId", fetchType = FetchType.EAGER)),
+            @Result(property = "courses", column = "id", javaType = List.class,
+                    many = @Many(select = "ru.otus.example.mybatisdemo.repositories.CourseRepository.getCoursesByStudentId", fetchType = FetchType.EAGER))
+    })
+    List<OtusStudent> findAllWithAllInfo();
+
+    @Select("select * from otus_students where id = #{id}")
+    @ResultMap("studentAllMap")
+    OtusStudent findById(long id);
+
+    @Select("select count(*) as students_count from otus_students")
+    long getStudentsCount();
+
+    @Insert("insert into otus_students(name, avatar_id) values (#{name}, #{avatar.id})")
+    void insert(OtusStudent student);
+
+    @Update("update otus_students set name = #{name} where id = #{id}")
+    void updateName(OtusStudent student);
+
+    @Delete("delete from otus_students where id = #{id}")
+    void deleteById(long id);
+
+}
@@ -0,0 +1,31 @@
+create table avatars(
+    id bigserial,
+    photo_url varchar(8000),
+    primary key (id)
+);
+
+create table courses(
+    id bigserial,
+    name varchar(255),
+    primary key (id)
+);
+
+create table otus_students(
+    id bigserial,
+    name varchar(255),
+    avatar_id bigint references avatars (id),
+    primary key (id)
+);
+
+create table emails(
+    id bigserial,
+    student_id bigint references otus_students(id) on delete cascade,
+    email varchar(255),
+    primary key (id)
+);
+
+create table student_courses(
+    student_id bigint references otus_students(id) on delete cascade,
+    course_id bigint references courses(id),
+    primary key (student_id, course_id)
+);
@@ -0,0 +1,110 @@
+package ru.otus.example.mybatisdemo.repositories;
+
+import lombok.val;
+import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
+import ru.otus.example.mybatisdemo.models.Avatar;
+import ru.otus.example.mybatisdemo.models.OtusStudent;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("Репозиторий на основе MyBatis для работы со студентами ")
+@SpringBootTest
+@Transactional
+public class OtusStudentRepositoryTest {
+
+    private static final String FIELD_ID = "id";
+    private static final String FIELD_PHOTO_URL = "photoUrl";
+    private static final String FIELD_NAME = "name";
+
+    private static final long FIRST_STUDENT_ID = 1L;
+    private static final long FIRST_AVATAR_ID = 1L;
+    private static final String FIRST_STUDENT_NAME = "student_01";
+    private static final String FIRST_AVATAR_URL = "photoUrl_01";
+    private static final String STUDENT_NEW_NAME = "Висусуалий";
+
+    private static final int EXPECTED_NUMBER_OF_STUDENTS = 10;
+    private static final long INSERTED_STUDENT_ID = 11L;
+    private static final int EXPECTED_EMAILS_COUNT = 2;
+    private static final int EXPECTED_COURSES_COUNT = 3;
+
+    @Autowired
+    private OtusStudentRepository studentRepositoryMyBatis;
+
+    @DisplayName("должен загружать список всех студентов с полной информацией о них")
+    @Test
+    void shouldReturnCorrectStudentsListWithAllInfo() {
+        val students = studentRepositoryMyBatis.findAllWithAllInfo();
+        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);
+    }
+
+    @DisplayName("должен загружать число студентов в БД")
+    @Test
+    void shouldReturnCorrectStudentsCount() {
+        long studentsCount = studentRepositoryMyBatis.getStudentsCount();
+        assertThat(studentsCount).isEqualTo(EXPECTED_NUMBER_OF_STUDENTS);
+    }
+
+    @DisplayName(" должен загружать информацию о нужном студенте")
+    @Test
+    void shouldFindExpectedStudentById(){
+        val actualStudent = studentRepositoryMyBatis.findById(FIRST_STUDENT_ID);
+
+        assertThat(actualStudent).isNotNull();
+        assertThat(actualStudent.getName()).isEqualTo(FIRST_STUDENT_NAME);
+        assertThat(actualStudent.getAvatar()).isNotNull()
+                .hasFieldOrPropertyWithValue(FIELD_ID, FIRST_STUDENT_ID)
+                .hasFieldOrPropertyWithValue(FIELD_PHOTO_URL, FIRST_AVATAR_URL);
+        assertThat(actualStudent.getEmails()).isNotNull().hasSize(EXPECTED_EMAILS_COUNT);
+        assertThat(actualStudent.getCourses()).isNotNull().hasSize(EXPECTED_COURSES_COUNT);
+    }
+
+    @DisplayName(" должен сохранить, а потом загрузить информацию о нужном студенте")
+    @Test
+    void shouldSaveAndLoadCorrectStudent() {
+        val expectedStudent = new OtusStudent(0, STUDENT_NEW_NAME,
+                new Avatar(FIRST_AVATAR_ID, FIRST_AVATAR_URL), List.of(), List.of());
+        studentRepositoryMyBatis.insert(expectedStudent);
+        val actualStudent = studentRepositoryMyBatis.findById(INSERTED_STUDENT_ID);
+
+        assertThat(actualStudent)
+                .isNotNull()
+                .usingRecursiveComparison(
+                        RecursiveComparisonConfiguration.builder()
+                                .withIgnoredFields(FIELD_ID).build())
+                .isEqualTo(expectedStudent);
+    }
+
+
+    @DisplayName(" должен обновлять имя студента в БД")
+    @Test
+    void shouldUpdateStudentName() {
+        val student = studentRepositoryMyBatis.findById(FIRST_STUDENT_ID);
+        student.setName(STUDENT_NEW_NAME);
+        studentRepositoryMyBatis.updateName(student);
+        val actualStudent = studentRepositoryMyBatis.findById(FIRST_STUDENT_ID);
+
+        assertThat(actualStudent).isNotNull().hasFieldOrPropertyWithValue(FIELD_NAME, student.getName());
+    }
+
+    @DisplayName("должен удалять студента из БД по id")
+    @Test
+    void shouldDeleteStudentFromDbById() {
+        val studentsCountBefore = studentRepositoryMyBatis.getStudentsCount();
+        studentRepositoryMyBatis.deleteById(FIRST_STUDENT_ID);
+        val studentsCountAfter = studentRepositoryMyBatis.getStudentsCount();
+
+        assertThat(studentsCountBefore - studentsCountAfter).isEqualTo(1);
+    }
+
+}
@@ -0,0 +1,8 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    initialization-mode: always
+
+logging:
+  level:
+    ru.otus.example.mybatisdemo.repositories: TRACE
@@ -0,0 +1,29 @@
+insert into avatars(photo_url)
+values ('photoUrl_01'), ('photoUrl_02'), ('photoUrl_03'), ('photoUrl_04'), ('photoUrl_05'),
+       ('photoUrl_06'), ('photoUrl_07'), ('photoUrl_08'), ('photoUrl_09'), ('photoUrl_10');
+
+insert into courses(name)
+values ('course_name_01'), ('course_name_02'), ('course_name_03'), ('course_name_04'), ('course_name_05'),
+       ('course_name_06'), ('course_name_07'), ('course_name_08'), ('course_name_09'), ('course_name_10'), ('not_used_11');
+
+insert into otus_students(name, avatar_id)
+values ('student_01', 1), ('student_02', 2), ('student_03', 3), ('student_04', 4), ('student_05', 5),
+       ('student_06', 6), ('student_07', 7), ('student_08', 8), ('student_09', 9), ('student_10', 10);
+
+
+insert into emails(email, student_id)
+values ('email_01', 1), ('email_02', 1), ('email_03', 2), ('email_04', 2), ('email_05', 3), ('email_06', 4),
+       ('email_07', 5), ('email_08', 6), ('email_09', 7), ('email_10', 8), ('email_11', 9), ('email_12', 10);
+
+
+insert into student_courses(student_id, course_id)
+values (1, 1),   (1, 2),   (1, 3),
+       (2, 2),   (2, 4),   (2, 5),
+       (3, 3),   (3, 6),   (3, 7),
+       (4, 4),   (4, 8),   (4, 9),
+       (5, 5),   (5, 10),  (5, 1),
+       (6, 6),   (6, 2),   (6, 3),
+       (7, 7),   (7, 4),   (7, 5),
+       (8, 8),   (8, 6),   (8, 7),
+       (9, 9),   (9, 8),   (9, 10),
+       (10, 10), (10, 1),  (10, 2);
@@ -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>
@@ -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,2 @@
+# spring-jdbc-demo
+Пример работы с БД через jdbc
@@ -0,0 +1,57 @@
+<?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.4.5</version>
+        <relativePath/>
+    </parent>
+    <groupId>ru.otus.example</groupId>
+    <artifactId>spring-jdbc-demo</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-jdbc-demo</name>
+    <description>Spring jdbc demo</description>
+
+    <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-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </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>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,13 @@
+package ru.otus.example.springjdbcdemo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringJdbcDemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SpringJdbcDemoApplication.class, args);
+	}
+
+}
@@ -0,0 +1,13 @@
+package ru.otus.example.springjdbcdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Avatar {
+    private long id;
+    private String photoUrl;
+}
@@ -0,0 +1,13 @@
+package ru.otus.example.springjdbcdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Course {
+    private long id;
+    private String name;
+}
@@ -0,0 +1,13 @@
+package ru.otus.example.springjdbcdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EMail {
+    private long id;
+    private String email;
+}
@@ -0,0 +1,18 @@
+package ru.otus.example.springjdbcdemo.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OtusStudent {
+    private long id;
+    private String name;
+    private Avatar avatar;
+    private List<EMail> emails;
+    private List<Course> courses;
+}
@@ -0,0 +1,9 @@
+package ru.otus.example.springjdbcdemo.repositories;
+
+import ru.otus.example.springjdbcdemo.models.Course;
+
+import java.util.List;
+
+public interface CourseRepositoryJdbc {
+    List<Course> findAllUsed();
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				insert into persons (id, `name`) values (1, 'masha');