GitHub/Spring
1
0
Fork 0
mirror of https://github.com/OtusTeam/Spring.git synced 2026-05-30 10:50:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

liquibase example added and global examples mirgation to java11 and spring boot 2.2.1

Browse Source
This commit is contained in:
stvort
2019-11-28 23:19:33 +04:00
parent 0c74f83f32
commit 29e44725f2
40 changed files with 307 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/README.md
+2 -1
View File
@@ -8,4 +8,5 @@
* *mongo-db-demo* - демонстрация подходов к хранению вложенных сущностенй в MongoDB, работы с MongoEventListener, агрегациями и инструментом миграций Mongock
* *docker-test-containers* - пример настройки TestContainers для монги
* *spring-cloud-demo-stvort* - пример работы двух микросевисов с использованием Config server, Eureka, Zuul, Feign client
* *spring-mail-integration-demo* - пример работы с SpringMail через SpringIntegration
* *spring-mail-integration-demo* - пример работы с SpringMail через SpringIntegration
* *liquibase-demo* - пример работы с liquibase
examples/hibernate-fetch-mode-demo/pom.xml
+9 -3
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus.example</groupId>
@@ -15,7 +15,9 @@
<description>Demo project for Spring Boot</description>
<properties>
<java.version>1.8</java.version>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
@@ -23,10 +25,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.shell</groupId>
<artifactId>spring-shell-starter</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.0.1.RELEASE</version>
</dependency>
<dependency>
@@ -34,16 +37,19 @@
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
</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>
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/repositories/MentorRepository.java
-9
View File
@@ -1,9 +0,0 @@
package ru.otus.example.HibernateFetchModeDemo.repositories;
import ru.otus.example.HibernateFetchModeDemo.models.Mentor;
import java.util.List;
public interface MentorRepository {
List<Mentor> findAll();
}
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/repositories/StudentRepository.java
-9
View File
@@ -1,9 +0,0 @@
package ru.otus.example.HibernateFetchModeDemo.repositories;
import ru.otus.example.HibernateFetchModeDemo.models.Student;
import java.util.List;
public interface StudentRepository {
List<Student> findAll();
}
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/repositories/TeacherRepository.java
-9
View File
@@ -1,9 +0,0 @@
package ru.otus.example.HibernateFetchModeDemo.repositories;
import ru.otus.example.HibernateFetchModeDemo.models.Teacher;
import java.util.List;
public interface TeacherRepository {
List<Teacher> findAll();
}
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/HibernateFetchModeDemoApplication.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/HibernateFetchModeDemoApplication.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.otus.example.HibernateFetchModeDemo;
package ru.otus.example.hibernate_fetch_mode_demo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/models/Knowledge.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/models/Knowledge.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.otus.example.HibernateFetchModeDemo.models;
package ru.otus.example.hibernate_fetch_mode_demo.models;
import lombok.AllArgsConstructor;
import lombok.Data;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/models/Mentor.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/models/Mentor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.otus.example.HibernateFetchModeDemo.models;
package ru.otus.example.hibernate_fetch_mode_demo.models;
import lombok.AllArgsConstructor;
import lombok.Data;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/models/Student.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/models/Student.java
+1 -2
View File
@@ -1,9 +1,8 @@
package ru.otus.example.HibernateFetchModeDemo.models;
package ru.otus.example.hibernate_fetch_mode_demo.models;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/models/Teacher.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/models/Teacher.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.otus.example.HibernateFetchModeDemo.models;
package ru.otus.example.hibernate_fetch_mode_demo.models;
import lombok.AllArgsConstructor;
import lombok.Data;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/repositories/MentorRepository.java
+9
View File
@@ -0,0 +1,9 @@
package ru.otus.example.hibernate_fetch_mode_demo.repositories;
import ru.otus.example.hibernate_fetch_mode_demo.models.Mentor;
import java.util.List;
public interface MentorRepository {
List<Mentor> findAll();
}
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/repositories/MentorRepositoryImpl.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/repositories/MentorRepositoryImpl.java
+2 -2
View File
@@ -1,7 +1,7 @@
package ru.otus.example.HibernateFetchModeDemo.repositories;
package ru.otus.example.hibernate_fetch_mode_demo.repositories;
import org.springframework.stereotype.Repository;
import ru.otus.example.HibernateFetchModeDemo.models.Mentor;
import ru.otus.example.hibernate_fetch_mode_demo.models.Mentor;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/repositories/StudentRepository.java
+9
View File
@@ -0,0 +1,9 @@
package ru.otus.example.hibernate_fetch_mode_demo.repositories;
import ru.otus.example.hibernate_fetch_mode_demo.models.Student;
import java.util.List;
public interface StudentRepository {
List<Student> findAll();
}
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/repositories/StudentRepositoryImpl.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/repositories/StudentRepositoryImpl.java
+2 -2
View File
@@ -1,7 +1,7 @@
package ru.otus.example.HibernateFetchModeDemo.repositories;
package ru.otus.example.hibernate_fetch_mode_demo.repositories;
import org.springframework.stereotype.Repository;
import ru.otus.example.HibernateFetchModeDemo.models.Student;
import ru.otus.example.hibernate_fetch_mode_demo.models.Student;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/repositories/TeacherRepository.java
+9
View File
@@ -0,0 +1,9 @@
package ru.otus.example.hibernate_fetch_mode_demo.repositories;
import ru.otus.example.hibernate_fetch_mode_demo.models.Teacher;
import java.util.List;
public interface TeacherRepository {
List<Teacher> findAll();
}
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/repositories/TeacherRepositoryImpl.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/repositories/TeacherRepositoryImpl.java
+2 -2
View File
@@ -1,7 +1,7 @@
package ru.otus.example.HibernateFetchModeDemo.repositories;
package ru.otus.example.hibernate_fetch_mode_demo.repositories;
import org.springframework.stereotype.Repository;
import ru.otus.example.HibernateFetchModeDemo.models.Teacher;
import ru.otus.example.hibernate_fetch_mode_demo.models.Teacher;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/HibernateFetchModeDemo/shell/ShellCommands.java → examples/hibernate-fetch-mode-demo/src/main/java/ru/otus/example/hibernate_fetch_mode_demo/shell/ShellCommands.java
+7 -7
View File
@@ -1,13 +1,13 @@
package ru.otus.example.HibernateFetchModeDemo.shell;
package ru.otus.example.hibernate_fetch_mode_demo.shell;
import org.springframework.shell.standard.ShellComponent;
import org.springframework.shell.standard.ShellMethod;
import ru.otus.example.HibernateFetchModeDemo.models.Mentor;
import ru.otus.example.HibernateFetchModeDemo.models.Student;
import ru.otus.example.HibernateFetchModeDemo.models.Teacher;
import ru.otus.example.HibernateFetchModeDemo.repositories.MentorRepository;
import ru.otus.example.HibernateFetchModeDemo.repositories.StudentRepository;
import ru.otus.example.HibernateFetchModeDemo.repositories.TeacherRepository;
import ru.otus.example.hibernate_fetch_mode_demo.models.Mentor;
import ru.otus.example.hibernate_fetch_mode_demo.models.Student;
import ru.otus.example.hibernate_fetch_mode_demo.models.Teacher;
import ru.otus.example.hibernate_fetch_mode_demo.repositories.MentorRepository;
import ru.otus.example.hibernate_fetch_mode_demo.repositories.StudentRepository;
import ru.otus.example.hibernate_fetch_mode_demo.repositories.TeacherRepository;
import java.util.stream.Collectors;
examples/hibernate-fetch-mode-demo/src/main/resources/schema.sql
+4 -4
View File
@@ -8,22 +8,22 @@ DROP TABLE IF EXISTS knowledge;
CREATE TABLE knowledge (
id BIGINT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(255),
name VARCHAR(255)
);
CREATE TABLE students (
id BIGINT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(255),
name VARCHAR(255)
);
CREATE TABLE mentors (
id BIGINT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(255),
name VARCHAR(255)
);
CREATE TABLE teachers (
id BIGINT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(255),
name VARCHAR(255)
);
CREATE TABLE students_experience (
examples/hibernate-fetch-mode-demo/src/test/resources/application.yml
-1
View File
@@ -1 +0,0 @@
examples/liquibase-demo/.gitignore
+4
View File
@@ -0,0 +1,4 @@
.idea/
*.iml
target/
examples/liquibase-demo/README.md
+6
View File
@@ -0,0 +1,6 @@
## Пример работы с liquibase
В примере демонстрируется:
* *структура файлов changelog-ов в YAML-формате*
* *создание таблицы user средствами liquibase*
* *наполнение созданной таблицы данными средствами liquibase*
examples/liquibase-demo/pom.xml
+50
View File
@@ -0,0 +1,50 @@
<?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>liquibase-demo</artifactId>
<version>1.0-SNAPSHOT</version>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.1.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-web</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.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
examples/liquibase-demo/src/main/java/ru/otus/spring/Main.java
+12
View File
@@ -0,0 +1,12 @@
package ru.otus.spring;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class Main {
public static void main(String[] args) {
SpringApplication.run(Main.class);
}
}
examples/liquibase-demo/src/main/resources/application.yaml
+3
View File
@@ -0,0 +1,3 @@
spring:
h2.console.enabled: true
liquibase.enabled: true
examples/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-11--0001-user.yaml
+20
View File
@@ -0,0 +1,20 @@
databaseChangeLog:
- changeSet:
id: 2018-01-11--0001--user
author: ydvorzhetskiy
createTable:
tableName: user
columns:
- column:
name: id
type: varchar(32)
constraints:
nullable: false
primaryKey: true
primaryKeyName: pk_user
- column:
name: login
type: varchar(50)
- column:
name: password
type: varchar(50)
examples/liquibase-demo/src/main/resources/db/changelog/data/0001-users.yaml
+15
View File
@@ -0,0 +1,15 @@
databaseChangeLog:
- changeSet:
id: 0001-user-test-data
author: ydvorzhetskiy
context: test
runOnChange: true
loadUpdateData:
primaryKey: id
file: data/user.csv
relativeToChangelogFile: true
separator: ;
quotChar: '"'
seperator: ';'
encoding: UTF-8
tableName: user
examples/liquibase-demo/src/main/resources/db/changelog/data/data/user.csv
+4
View File
@@ -0,0 +1,4 @@
id;login;password
502ccf7de30f433588a406865e66fd03;root;123123
54fca574a4974ef1a983124c905605f6;masha;123123
ce063766716f47c2b130d1f28f010e1c;ivan;123123
1 id login password
2 502ccf7de30f433588a406865e66fd03 root 123123
3 54fca574a4974ef1a983124c905605f6 masha 123123
4 ce063766716f47c2b130d1f28f010e1c ivan 123123
examples/liquibase-demo/src/main/resources/db/changelog/db.changelog-master.yaml
+5
View File
@@ -0,0 +1,5 @@
databaseChangeLog:
- includeAll:
path: db/changelog/1.0/
- includeAll:
path: db/changelog/data/
examples/mongo-db-demo/pom.xml
+9 -11
View File
@@ -2,12 +2,14 @@
<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.1.8.RELEASE</version>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus.example</groupId>
<artifactId>mongo-db-demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -18,6 +20,7 @@
<java.version>11</java.version>
<maven.compiler.sourcre>11</maven.compiler.sourcre>
<maven.compiler.target>11</maven.compiler.target>
<mongock.version>2.0.2</mongock.version>
</properties>
<dependencies>
@@ -25,6 +28,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<dependency>
@@ -36,19 +40,13 @@
<dependency>
<groupId>com.github.cloudyrock.mongock</groupId>
<artifactId>mongock-spring</artifactId>
<version>2.0.0</version>
<version>${mongock.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.assertj</groupId>
<artifactId>org.assertj.core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--Тестирование-->
@@ -76,21 +74,21 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.21.0</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>2.23.0</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.12.0</version>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
examples/spring-cloud-demo-stvort/.gitignore
+29
View File
@@ -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/
examples/spring-cloud-demo-stvort/config-server/pom.xml
+7 -3
View File
@@ -2,12 +2,14 @@
<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.1.4.RELEASE</version>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus.example</groupId>
<artifactId>config-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -15,8 +17,10 @@
<description>Config server</description>
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
</properties>
<dependencies>
examples/spring-cloud-demo-stvort/facade-gateway/pom.xml
+7 -3
View File
@@ -2,12 +2,14 @@
<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.1.4.RELEASE</version>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus.example</groupId>
<artifactId>facade-gateway</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -15,8 +17,10 @@
<description>Facade gateway</description>
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
</properties>
<dependencies>
examples/spring-cloud-demo-stvort/greeting-microservice/pom.xml
+5 -5
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus.example</groupId>
@@ -15,10 +15,10 @@
<description>Greeting microservice</description>
<properties>
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
</properties>
<dependencies>
examples/spring-cloud-demo-stvort/names-microservice/pom.xml
+5 -5
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus.example</groupId>
@@ -15,10 +15,10 @@
<description>Names microservice</description>
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
</properties>
<dependencies>
examples/spring-cloud-demo-stvort/pom.xml
+20
View File
@@ -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>spring-cloud-demo-stvort</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<modules>
<module>config-server</module>
<module>service-discovery-server</module>
<module>greeting-microservice</module>
<module>names-microservice</module>
<module>facade-gateway</module>
</modules>
</project>
examples/spring-cloud-demo-stvort/service-discovery-server/pom.xml
+11 -4
View File
@@ -2,12 +2,14 @@
<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.1.4.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
<version>2.2.1.RELEASE</version>
<relativePath/>
</parent>
<groupId>ru.otus.example</groupId>
<artifactId>service-discovery-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -15,8 +17,10 @@
<description>Service discovery server</description>
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
</properties>
<dependencies>
@@ -24,14 +28,17 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-client</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
examples/spring-mail-integration-demo/pom.xml
+5 -1
View File
@@ -2,12 +2,14 @@
<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 https://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.1.9.RELEASE</version>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus.example</groupId>
<artifactId>spring-mail-integration-demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -16,6 +18,8 @@
<properties>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java
+2 -1
View File
@@ -69,7 +69,8 @@ public class IntegrationConfig {
.handle(m -> {
val isImportant = m.getHeaders().get(IS_IMPORTANT_MESSAGE, Boolean.class);
if (isImportant != null && isImportant) {
mailSender.send((SimpleMailMessage) m.getPayload());
System.out.println("Как будто посылаем письмо: " + m.getPayload());
//mailSender.send((SimpleMailMessage) m.getPayload());
}
})
)
examples/unit-testing-pure-spring/pom.xml
+20 -18
View File
@@ -2,12 +2,6 @@
<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.1.3.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.otus</groupId>
<artifactId>testing-example</artifactId>
@@ -16,16 +10,21 @@
<description>Unit testing example</description>
<properties>
<java.version>1.8</java.version>
<lombok.version>1.18.6</lombok.version>
<spring.version>5.1.5.RELEASE</spring.version>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<lombok.version>1.18.10</lombok.version>
<spring.version>5.2.1.RELEASE</spring.version>
<junit.jupiter.version>5.5.2</junit.jupiter.version>
<mockito.version>2.28.2</mockito.version>
<assertj.version>3.13.2</assertj.version>
</properties>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.6</version>
<version>${lombok.version}</version>
<optional>true</optional>
</dependency>
@@ -33,14 +32,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.1.5.RELEASE</version>
<version>${spring.version}</version>
</dependency>
<!-- Это для тестирования чистого Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>5.1.5.RELEASE</version>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
@@ -48,19 +47,21 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.3.2</version>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.3.2</version>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.3.2</version>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
@@ -68,13 +69,14 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.21.0</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>2.23.0</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
@@ -82,7 +84,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.12.0</version>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
examples/unit-testing-spring-boot/pom.xml
+8 -10
View File
@@ -5,8 +5,8 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
<version>2.2.1.RELEASE</version>
<relativePath/>
</parent>
<groupId>ru.otus</groupId>
@@ -16,7 +16,9 @@
<description>Unit testing example</description>
<properties>
<java.version>1.8</java.version>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
@@ -37,13 +39,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<!-- Убираем старый JUnit 4, мы тестируем с JUnit 5 -->
<exclusions>
<exclusion>
<groupId>org.junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--Тестирование-->
@@ -53,18 +48,21 @@
<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>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>