Skip to content

update #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<jdbc.url>jdbc:h2:../test</jdbc.url>
<jdbc.username>sa</jdbc.username>
<jdbc.password></jdbc.password>
<jooq.version>3.7.0</jooq.version>
<jooq.version>3.11.11</jooq.version>
<foo>ddddddd</foo>
</properties>

Expand All @@ -32,9 +32,11 @@
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jool</artifactId>
<version>0.9.7</version>
<version>0.9.14</version>
</dependency>



<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
Expand All @@ -48,4 +50,4 @@
</dependency>
</dependencies>

</project>
</project>
12 changes: 10 additions & 2 deletions db/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,21 @@
</parent>

<artifactId>db</artifactId>
<dependencies>
<!-- https://mvnrepository.com/artifact/org.liquibase/liquibase-maven-plugin -->
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<version>3.6.3</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<version>3.4.1</version>
<version>3.6.3</version>
<configuration>
<changeLogFile>src/main/resources/db/changelog/changelog.xml</changeLogFile>
<driver>org.h2.Driver</driver>
Expand All @@ -29,4 +37,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
10 changes: 5 additions & 5 deletions gatling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>io.gatling.highcharts</groupId>
<artifactId>gatling-charts-highcharts</artifactId>
<version>2.1.7</version>
<version>3.1.2</version>
</dependency>
</dependencies>

Expand All @@ -36,12 +36,12 @@
<plugin>
<groupId>io.gatling</groupId>
<artifactId>gatling-maven-plugin</artifactId>
<version>2.1.7</version>
<version>3.0.2</version>
<configuration>
<configFolder>src/test/resources</configFolder>
<dataFolder>src/test/resources/data</dataFolder>
<!-- <dataFolder>src/test/resources/data</dataFolder>-->
<resultsFolder>target/gatling/results</resultsFolder>
<bodiesFolder>src/test/resources/bodies</bodiesFolder>
<!-- <bodiesFolder>src/test/resources/bodies</bodiesFolder>-->
<simulationsFolder>src/test/scala</simulationsFolder>
<runMultipleSimulations>true</runMultipleSimulations>
<simulationClass>ReferenceSimulation</simulationClass>
Expand All @@ -52,4 +52,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
14 changes: 10 additions & 4 deletions hibernate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,33 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.0.2.Final</version>
<version>5.4.2.Final</version>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-hikaricp</artifactId>
<version>5.0.2.Final</version>
<version>5.4.2.Final</version>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.0.2.Final</version>
<version>5.4.2.Final</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
<version>2.0.5.RELEASE</version>
<scope>test</scope>
</dependency>

</dependencies>


</project>
</project>
3 changes: 1 addition & 2 deletions hibernate/src/main/java/demo/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
65 changes: 23 additions & 42 deletions hibernate/src/test/java/demo/HibernateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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);

Expand All @@ -90,20 +75,16 @@ public void testLoadData() throws Exception {
book.setTitle("TITLE_" + b);
return bookRepository.save(book);
}).collect(Collectors.toList()));

author = authorRepository.save(author);
authorRepository.save(author);
}
}



private Collection<AuthorWithBooks> sort(Collection<AuthorWithBooks> 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());
}

Expand Down
2 changes: 1 addition & 1 deletion jooq-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
</dependency>
</dependencies>

</project>
</project>
4 changes: 2 additions & 2 deletions jooq-extension/src/main/java/demo/jooq/CustomGeneratorStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
25 changes: 20 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.0.BUILD-SNAPSHOT</version>
<version>2.0.5.RELEASE</version>
<relativePath/>
</parent>

Expand All @@ -24,12 +24,15 @@
</modules>

<properties>
<jmh.version>1.21</jmh.version>


<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<jdbc.url>jdbc:h2:../test</jdbc.url>
<jdbc.username>sa</jdbc.username>
<jdbc.password></jdbc.password>
<jooq.version>3.7.0</jooq.version>
<jooq.version>3.11.11</jooq.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -68,18 +71,30 @@
<scope>compile</scope>
</dependency>

<!-- <dependency>-->
<!-- <groupId>org.openjdk.jmh</groupId>-->
<!-- <artifactId>jmh-core</artifactId>-->
<!-- <version>1.11.1</version>-->
<!-- </dependency>-->

<!-- <dependency>-->
<!-- <groupId>org.openjdk.jmh</groupId>-->
<!-- <artifactId>jmh-generator-annprocess</artifactId>-->
<!-- <version>1.11.1</version>-->
<!-- </dependency>-->

<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>1.11.1</version>
<version>${jmh.version}</version>
</dependency>

<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>1.11.1</version>
<version>${jmh.version}</version>
</dependency>


<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-reflection</artifactId>
Expand Down