Feature/hw 07 spring data jpa

README.md

@@ -1,2 +1,12 @@
 # OtusSpringHW-Library
-Домашние задания по Spring для Otus с базами данных.
+
+Домашнее задание #7:
+- Переделать билиотеку на Spring Data JPA.
+- Реализовать весь функционал работы с БД в приложении книг с использованием spring-data-jpa репозиториев.
+
+### 19-06-22 Доработки
+- Подключил liquibase.
+
+### 19-07-07 Доработки
+- Использование Mockito для тестирования сервисов.
+- Использование @NamedEntityGraph.

pom.xml

@@ -0,0 +1,220 @@
+<?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>
+
+    <name>home-work</name>
+
+    <groupId>ru.otus.mkulikov</groupId>
+    <artifactId>home-work</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.3.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
+    <properties>
+        <encoding>UTF-8</encoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.sf.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.12.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.3.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.3.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.4.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.21.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>2.23.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Spring Boot -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.shell</groupId>
+            <artifactId>spring-shell-starter</artifactId>
+            <version>2.0.0.RELEASE</version>
+        </dependency>
+
+        <!-- H2 database -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.199</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
+
+        <!-- JPA -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>2.0.8.RELEASE</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>${encoding}</encoding>
+                </configuration>
+            </plugin>
+
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+
+                <configuration>
+                    <skipTests>false</skipTests>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.liquibase</groupId>
+                <artifactId>liquibase-maven-plugin</artifactId>
+                <version>3.6.3</version>
+                <configuration>
+                    <propertyFileWillOverride>true</propertyFileWillOverride>
+                    <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
+                    <changeLogFile>classpath:/db/changelog/db.changelog-master.yaml</changeLogFile>
+                </configuration>
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>update</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+                <dependencies>
+                    <dependency>
+                        <groupId>org.yaml</groupId>
+                        <artifactId>snakeyaml</artifactId>
+                        <version>1.23</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.csv</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.txt</include>
+                    <include>**/*.yml</include>
+                    <include>**/*.sql</include>
+                    <include>**/*.yaml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>

src/main/java/ru/otus/mkulikov/Application.java

@@ -0,0 +1,20 @@
+package ru.otus.mkulikov;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Developer: Maksim Kulikov
+ * Date: 2019-03-14
+ * Time: 15:27
+ */
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) throws Exception {
+        SpringApplication.run(Application.class);
+        //Console.main(args);
+    }
+}

src/main/java/ru/otus/mkulikov/app/dao/AuthorDao.java

@@ -0,0 +1,17 @@
+package ru.otus.mkulikov.app.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import ru.otus.mkulikov.app.model.Author;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Developer: Maksim Kulikov
+ * Date: 23.05.2019
+ * Time: 17:06
+ */
+
+@Repository
+public interface AuthorDao extends JpaRepository<Author, Long> {
+
+}

src/main/java/ru/otus/mkulikov/app/dao/BookDao.java

@@ -0,0 +1,17 @@
+package ru.otus.mkulikov.app.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import ru.otus.mkulikov.app.model.Book;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Developer: Maksim Kulikov
+ * Date: 23.05.2019
+ * Time: 13:28
+ */
+
+@Repository
+public interface BookDao extends JpaRepository<Book, Long>, BookDaoCustom<Book> {
+
+}

src/main/java/ru/otus/mkulikov/app/dao/BookDaoCustom.java

@@ -0,0 +1,22 @@
+package ru.otus.mkulikov.app.dao;
+
+import org.springframework.stereotype.Repository;
+import ru.otus.mkulikov.app.model.Book;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Developer: Maksim Kulikov
+ * Date: 24.06.2019
+ * Time: 11:48
+ */
+
+@Repository
+public interface BookDaoCustom<T extends Book> {
+
+    Optional<T> getById(long id);
+
+    List<T> getAllObjects();
+}

src/main/java/ru/otus/mkulikov/app/dao/BookDaoCustomImpl.java

@@ -0,0 +1,49 @@
+package ru.otus.mkulikov.app.dao;
+
+import lombok.RequiredArgsConstructor;
+import ru.otus.mkulikov.app.model.Book;
+
+import javax.persistence.EntityGraph;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Developer: Maksim Kulikov
+ * Date: 23.05.2019
+ * Time: 13:28
+ */
+
+@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"})
+@RequiredArgsConstructor
+public class BookDaoCustomImpl implements BookDaoCustom<Book> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    @Override
+    public Optional<Book> getById(long id) {
+        EntityGraph entityGraph = em.getEntityGraph("BookGraph");
+        List<Book> books = em.createQuery("select b from Book b where b.id = :id ", Book.class)
+                .setHint("javax.persistence.fetchgraph", entityGraph)
+                .setParameter("id", id)
+                .getResultList();
+
+        em.clear();
+        return (books != null && !books.isEmpty()) ? Optional.of(books.get(0)) : Optional.empty();
+    }
+
+    @Override
+    public List<Book> getAllObjects() {
+        EntityGraph entityGraph = em.getEntityGraph("BookGraph");
+        List<Book> books = em.createQuery("select b from Book b order by b.id ", Book.class)
+                .setHint("javax.persistence.fetchgraph", entityGraph)
+                .getResultList();
+
+        em.clear();
+        return books;
+    }
+}
+

src/main/java/ru/otus/mkulikov/app/dao/CommentDao.java

@@ -0,0 +1,17 @@
+package ru.otus.mkulikov.app.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import ru.otus.mkulikov.app.model.Comment;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Developer: Maksim Kulikov
+ * Date: 20.06.2019
+ * Time: 23:48
+ */
+
+@Repository
+public interface CommentDao extends JpaRepository<Comment, Long>, CommentDaoCustom<Comment> {
+
+}