From 4e26fc4d5cc1aada549ac25d77281a46efb5abb6 Mon Sep 17 00:00:00 2001 From: Alexander Curvers <6527080+acurvers@users.noreply.github.com> Date: Sat, 18 May 2019 08:16:31 +0200 Subject: [PATCH] update --- application/pom.xml | 8 ++- db/pom.xml | 12 +++- gatling/pom.xml | 10 +-- hibernate/pom.xml | 14 ++-- hibernate/src/main/java/demo/Application.java | 3 +- .../src/test/java/demo/HibernateTest.java | 65 +++++++------------ jooq-extension/pom.xml | 2 +- .../demo/jooq/CustomGeneratorStrategy.java | 4 +- pom.xml | 25 +++++-- 9 files changed, 77 insertions(+), 66 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 2b1d078..2958404 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -17,7 +17,7 @@ jdbc:h2:../test sa - 3.7.0 + 3.11.11 ddddddd @@ -32,9 +32,11 @@ org.jooq jool - 0.9.7 + 0.9.14 + + org.jooq jooq @@ -48,4 +50,4 @@ - \ No newline at end of file + diff --git a/db/pom.xml b/db/pom.xml index 519c07e..ef5bff6 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -11,13 +11,21 @@ db + + + + org.liquibase + liquibase-maven-plugin + 3.6.3 + + org.liquibase liquibase-maven-plugin - 3.4.1 + 3.6.3 src/main/resources/db/changelog/changelog.xml org.h2.Driver @@ -29,4 +37,4 @@ - \ No newline at end of file + diff --git a/gatling/pom.xml b/gatling/pom.xml index 22850d2..6518b51 100644 --- a/gatling/pom.xml +++ b/gatling/pom.xml @@ -20,7 +20,7 @@ io.gatling.highcharts gatling-charts-highcharts - 2.1.7 + 3.1.2 @@ -36,12 +36,12 @@ io.gatling gatling-maven-plugin - 2.1.7 + 3.0.2 src/test/resources - src/test/resources/data + target/gatling/results - src/test/resources/bodies + src/test/scala true ReferenceSimulation @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/hibernate/pom.xml b/hibernate/pom.xml index 0810166..1955503 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -21,27 +21,33 @@ org.hibernate hibernate-entitymanager - 5.0.2.Final + 5.4.2.Final org.hibernate hibernate-hikaricp - 5.0.2.Final + 5.4.2.Final org.hibernate hibernate-core - 5.0.2.Final + 5.4.2.Final org.springframework.boot spring-boot-starter-undertow + + org.springframework.boot + spring-boot-test + 2.0.5.RELEASE + test + - \ No newline at end of file + diff --git a/hibernate/src/main/java/demo/Application.java b/hibernate/src/main/java/demo/Application.java index 29bd1b4..d163477 100644 --- a/hibernate/src/main/java/demo/Application.java +++ b/hibernate/src/main/java/demo/Application.java @@ -2,8 +2,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; -import org.springframework.boot.orm.jpa.EntityScan; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/hibernate/src/test/java/demo/HibernateTest.java b/hibernate/src/test/java/demo/HibernateTest.java index a5e251c..51003ee 100644 --- a/hibernate/src/test/java/demo/HibernateTest.java +++ b/hibernate/src/test/java/demo/HibernateTest.java @@ -1,47 +1,33 @@ package demo; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import java.io.File; -import java.sql.SQLException; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ThreadLocalRandom; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - +import com.fasterxml.jackson.databind.ObjectMapper; +import demo.domain.Author; +import demo.domain.AuthorWithBooks; +import demo.domain.Book; +import demo.repository.AuthorRepository; +import demo.repository.BookRepository; +import demo.service.AuthorQueries; import org.apache.commons.io.FileUtils; -import org.hibernate.CacheMode; -import org.hibernate.Criteria; -import org.hibernate.FetchMode; -import org.hibernate.Session; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.Commit; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import antlr.collections.impl.IntRange; -import com.fasterxml.jackson.databind.ObjectMapper; -import demo.domain.Author; -import demo.domain.AuthorWithBooks; -import demo.domain.Book; -import demo.repository.AuthorRepository; -import demo.repository.BookRepository; -import demo.service.AuthorQueries; +import java.io.File; +import java.util.Collection; +import java.util.Comparator; +import java.util.concurrent.ThreadLocalRandom; +import java.util.stream.Collectors; +import java.util.stream.IntStream; -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +//@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) +@SpringBootTest(classes = Application.class) +//@SpringApplicationConfiguration(classes = Application.class) @Commit @Transactional public class HibernateTest { @@ -76,12 +62,11 @@ public void testQueries() throws Exception { @Test public void testLoadData() throws Exception { - bookRepository.deleteAll(); authorRepository.deleteAll(); - for (int i = 0; i < 100; i++) { + for (int i = 0; i < 100; i++) { Author author = new Author(); author.setName("AUTHOR_" + i); @@ -90,8 +75,7 @@ public void testLoadData() throws Exception { book.setTitle("TITLE_" + b); return bookRepository.save(book); }).collect(Collectors.toList())); - - author = authorRepository.save(author); + authorRepository.save(author); } } @@ -99,11 +83,8 @@ public void testLoadData() throws Exception { private Collection sort(Collection authorWithBooks){ return authorWithBooks.stream() - .sorted((l, r) -> l.getAuthor().getId().compareTo(r.getAuthor().getId())) - .map(ab -> { - ab.getBooks().sort((l, r) -> l.getId().compareTo(r.getId())); - return ab; - }) + .sorted(Comparator.comparing(authorWithBooks1 -> authorWithBooks1.getAuthor().getId())) + .peek(ab -> ab.getBooks().sort(Comparator.comparing(Book::getId))) .collect(Collectors.toList()); } diff --git a/jooq-extension/pom.xml b/jooq-extension/pom.xml index b51ffcf..be2e30d 100644 --- a/jooq-extension/pom.xml +++ b/jooq-extension/pom.xml @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/jooq-extension/src/main/java/demo/jooq/CustomGeneratorStrategy.java b/jooq-extension/src/main/java/demo/jooq/CustomGeneratorStrategy.java index 6930f7e..ac8cdaa 100644 --- a/jooq-extension/src/main/java/demo/jooq/CustomGeneratorStrategy.java +++ b/jooq-extension/src/main/java/demo/jooq/CustomGeneratorStrategy.java @@ -1,8 +1,8 @@ package demo.jooq; import org.jooq.tools.StringUtils; -import org.jooq.util.DefaultGeneratorStrategy; -import org.jooq.util.Definition; +import org.jooq.codegen.DefaultGeneratorStrategy; +import org.jooq.meta.Definition; /** * Created by nlabrot on 28/09/15. diff --git a/pom.xml b/pom.xml index f1824ed..6f082c5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.0.BUILD-SNAPSHOT + 2.0.5.RELEASE @@ -24,12 +24,15 @@ + 1.21 + + UTF-8 1.8 jdbc:h2:../test sa - 3.7.0 + 3.11.11 @@ -68,18 +71,30 @@ compile + + + + + + + + + + + + org.openjdk.jmh jmh-core - 1.11.1 + ${jmh.version} - org.openjdk.jmh jmh-generator-annprocess - 1.11.1 + ${jmh.version} + org.openjdk.jmh jmh-generator-reflection