From 686857c2518ddc7f59818a011c7a92161ff994e5 Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Sat, 20 Nov 2021 09:45:50 +0530
Subject: [PATCH] JAVA-8435: reducing logging for tutorials-integration job
---
.../r2dbc/src/test/resources/logback-test.xml | 12 +++++
.../src/test/resources/logback-test.xml | 12 +++++
.../DatasourceProxyBeanPostProcessor.java | 5 +-
.../src/main/resources/application.properties | 2 +-
.../src/test/resources/logback-test.xml | 12 +++++
.../src/test/resources/logback-test.xml | 12 +++++
.../EnversFooBarAuditIntegrationTest.java | 37 +++++++++-----
.../persistence/hibernate/FooFixtures.java | 39 +++++++++------
.../FooSortingPersistenceIntegrationTest.java | 49 ++++++++++++-------
...rentServicePersistenceIntegrationTest.java | 13 +++--
.../spring/config/PersistenceTestConfig.java | 2 +-
.../query/UserRepositoryIntegrationTest.java | 25 ++++------
.../ArticleRepositoryIntegrationTest.java | 2 +-
.../src/test/resources/fetching.cfg.xml | 2 +-
.../src/test/resources/fetchingLazy.cfg.xml | 2 +-
.../SpringDataAggregateIntegrationTest.java | 3 +-
.../PassengerRepositoryIntegrationTest.java | 3 +-
.../EntityGraphIntegrationTest.java | 2 +-
.../exists/CarRepositoryIntegrationTest.java | 2 +
.../joins/JpaJoinsIntegrationTest.java | 3 +-
.../src/test/resources/logback-test.xml | 12 +++++
.../saveperformance/BookApplication.java | 10 ++--
.../src/test/resources/logback-test.xml | 12 +++++
.../InventoryRepositoryIntegrationTest.java | 2 +-
.../daos/JpaRepositoriesIntegrationTest.java | 2 +-
.../UserRepositoryIntegrationTest.java | 2 +-
.../like/MovieRepositoryIntegrationTest.java | 2 +-
.../FruitPopulatorIntegrationTest.java | 2 +-
.../PassengerRepositoryIntegrationTest.java | 2 +-
.../SongRepositoryIntegrationTest.java | 2 +-
.../src/test/resources/logback-test.xml | 12 +++++
.../dynamicupdate/DynamicUpdateConfig.java | 2 +-
.../immutable/util/HibernateUtil.java | 9 +++-
.../manytomany/util/HibernateUtil.java | 16 +++---
.../manytomany/spring/PersistenceConfig.java | 2 +-
.../baeldung/spring/PersistenceConfig.java | 2 +-
.../src/main/resources/immutable.cfg.xml | 2 +-
.../src/main/resources/manytomany.cfg.xml | 2 +-
.../src/test/resources/manytomany.cfg.xml | 2 +-
.../guide/EmployeeDAOIntegrationTest.java | 6 ++-
.../src/test/resources/logback-test.xml | 12 +++++
.../main/resources/persistence-h2.properties | 2 +-
.../src/test/resources/logback-test.xml | 12 +++++
.../test/resources/manytomany/test.properties | 2 +-
.../main/resources/persistence-h2.properties | 2 +-
.../persistence-student-h2.properties | 2 +-
.../resources/persistence-student.properties | 2 +-
.../src/test/java/META-INF/persistence.xml | 2 +-
...oPaginationPersistenceIntegrationTest.java | 6 ++-
.../FooServiceSortingIntegrationTest.java | 22 +++++----
...eSortingWitNullsManualIntegrationTest.java | 8 ++-
.../resources/persistence-student.properties | 2 +-
pom.xml | 6 +++
53 files changed, 300 insertions(+), 122 deletions(-)
create mode 100644 persistence-modules/r2dbc/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-boot-persistence-2/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-boot-persistence-mongodb/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-data-cassandra-reactive/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-data-jpa-query/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-data-jpa-repo-2/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-data-jpa-repo/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-jdbc/src/test/resources/logback-test.xml
create mode 100644 persistence-modules/spring-jpa-2/src/test/resources/logback-test.xml
diff --git a/persistence-modules/r2dbc/src/test/resources/logback-test.xml b/persistence-modules/r2dbc/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/r2dbc/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/resources/logback-test.xml b/persistence-modules/spring-boot-persistence-2/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-2/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/lazy_load_no_trans/config/DatasourceProxyBeanPostProcessor.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/lazy_load_no_trans/config/DatasourceProxyBeanPostProcessor.java
index c087427b65..1952a26f2f 100644
--- a/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/lazy_load_no_trans/config/DatasourceProxyBeanPostProcessor.java
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/lazy_load_no_trans/config/DatasourceProxyBeanPostProcessor.java
@@ -1,10 +1,7 @@
package com.baeldung.h2db.lazy_load_no_trans.config;
import net.ttddyy.dsproxy.listener.DataSourceQueryCountListener;
-import net.ttddyy.dsproxy.listener.logging.CommonsQueryLoggingListener;
-import net.ttddyy.dsproxy.listener.logging.DefaultQueryLogEntryCreator;
import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel;
-import net.ttddyy.dsproxy.listener.logging.SLF4JQueryLoggingListener;
import net.ttddyy.dsproxy.support.ProxyDataSource;
import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder;
import org.aopalliance.intercept.MethodInterceptor;
@@ -49,7 +46,7 @@ public class DatasourceProxyBeanPostProcessor implements BeanPostProcessor {
this.dataSource = ProxyDataSourceBuilder.create(dataSource)
.name("MyDS")
.multiline()
- .logQueryBySlf4j(SLF4JLogLevel.INFO)
+ .logQueryBySlf4j(SLF4JLogLevel.DEBUG)
.listener(new DataSourceQueryCountListener())
.build();
}
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
index 134cda6628..2499d7cd06 100644
--- a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
@@ -4,7 +4,7 @@ spring.datasource.username=sa
spring.datasource.password=
spring.jpa.defer-datasource-initialization=true
spring.jpa.hibernate.ddl-auto=create-drop
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
spring.jpa.properties.hibernate.format_sql=true
spring.jpa.properties.hibernate.validator.apply_to_ddl=false
#spring.jpa.properties.hibernate.check_nullability=true
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/resources/logback-test.xml b/persistence-modules/spring-boot-persistence-mongodb/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-data-cassandra-reactive/src/test/resources/logback-test.xml b/persistence-modules/spring-data-cassandra-reactive/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-data-cassandra-reactive/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
index 444324dafc..7397a61cac 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
@@ -123,24 +123,39 @@ public class EnversFooBarAuditIntegrationTest {
assertNotNull(barRevisionList);
assertEquals(4, barRevisionList.size());
- assertEquals("BAR", barRevisionList.get(0).getName());
- assertEquals("BAR", barRevisionList.get(1).getName());
- assertEquals("BAR1", barRevisionList.get(2).getName());
- assertEquals("BAR1", barRevisionList.get(3).getName());
+ assertEquals("BAR", barRevisionList.get(0)
+ .getName());
+ assertEquals("BAR", barRevisionList.get(1)
+ .getName());
+ assertEquals("BAR1", barRevisionList.get(2)
+ .getName());
+ assertEquals("BAR1", barRevisionList.get(3)
+ .getName());
- assertEquals(1, barRevisionList.get(0).getFooSet().size());
- assertEquals(2, barRevisionList.get(1).getFooSet().size());
- assertEquals(2, barRevisionList.get(2).getFooSet().size());
- assertEquals(3, barRevisionList.get(3).getFooSet().size());
+ assertEquals(1, barRevisionList.get(0)
+ .getFooSet()
+ .size());
+ assertEquals(2, barRevisionList.get(1)
+ .getFooSet()
+ .size());
+ assertEquals(2, barRevisionList.get(2)
+ .getFooSet()
+ .size());
+ assertEquals(3, barRevisionList.get(3)
+ .getFooSet()
+ .size());
// test Foo revisions
fooRevisionList = fooService.getRevisions();
assertNotNull(fooRevisionList);
assertEquals(3, fooRevisionList.size());
- assertEquals("FOO1", fooRevisionList.get(0).getName());
- assertEquals("FOO2", fooRevisionList.get(1).getName());
- assertEquals("FOO3", fooRevisionList.get(2).getName());
+ assertEquals("FOO1", fooRevisionList.get(0)
+ .getName());
+ assertEquals("FOO2", fooRevisionList.get(1)
+ .getName());
+ assertEquals("FOO3", fooRevisionList.get(2)
+ .getName());
}
}
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java
index da840dc027..e0bd8a4f98 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java
@@ -10,8 +10,13 @@ import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FooFixtures {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(FooFixtures.class);
+
private SessionFactory sessionFactory;
public FooFixtures(final SessionFactory sessionFactory) {
@@ -36,26 +41,30 @@ public class FooFixtures {
foo.setBar(bar);
session.save(foo);
final Foo foo2 = new Foo(null);
- if (i % 2 == 0)
+ if (i % 2 == 0) {
foo2.setName("LuckyFoo" + (i + 120));
+ }
foo2.setBar(bar);
session.save(foo2);
- bar.getFooSet().add(foo);
- bar.getFooSet().add(foo2);
+ bar.getFooSet()
+ .add(foo);
+ bar.getFooSet()
+ .add(foo2);
session.merge(bar);
}
tx.commit();
session.flush();
} catch (final HibernateException he) {
- if (tx != null)
+ if (tx != null) {
tx.rollback();
- System.out.println("Not able to open session");
- he.printStackTrace();
+ }
+ LOGGER.error("Not able to open session", he);
} catch (final Exception e) {
- e.printStackTrace();
+ LOGGER.error(e.getLocalizedMessage(), e);
} finally {
- if (session != null)
+ if (session != null) {
session.close();
+ }
}
}
@@ -71,7 +80,8 @@ public class FooFixtures {
final Foo foo = new Foo();
foo.setName("Foo_" + (i + 120));
final Bar bar = new Bar("bar_" + i);
- bar.getFooSet().add(foo);
+ bar.getFooSet()
+ .add(foo);
foo.setBar(bar);
fooList.add(foo);
@@ -86,15 +96,16 @@ public class FooFixtures {
tx.commit();
session.flush();
} catch (final HibernateException he) {
- if (tx != null)
+ if (tx != null) {
tx.rollback();
- System.out.println("Not able to open session");
- he.printStackTrace();
+ }
+ LOGGER.error("Not able to open session", he);
} catch (final Exception e) {
- e.printStackTrace();
+ LOGGER.error(e.getLocalizedMessage(), e);
} finally {
- if (session != null)
+ if (session != null) {
session.close();
+ }
}
}
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java
index 8173088af0..fe73ddba3f 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java
@@ -15,6 +15,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,6 +31,8 @@ import com.baeldung.spring.config.PersistenceTestConfig;
@SuppressWarnings("unchecked")
public class FooSortingPersistenceIntegrationTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FooSortingPersistenceIntegrationTest.class);
+
@Autowired
private SessionFactory sessionFactory;
@@ -46,7 +50,8 @@ public class FooSortingPersistenceIntegrationTest {
@After
public void after() {
- session.getTransaction().commit();
+ session.getTransaction()
+ .commit();
session.close();
}
@@ -56,7 +61,7 @@ public class FooSortingPersistenceIntegrationTest {
final Query query = session.createQuery(hql);
final List fooList = query.list();
for (final Foo foo : fooList) {
- System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+ LOGGER.debug("Name: {} , Id: {}", foo.getName(), foo.getId());
}
}
@@ -66,9 +71,10 @@ public class FooSortingPersistenceIntegrationTest {
final Query query = session.createQuery(hql);
final List fooList = query.list();
- assertNull(fooList.get(fooList.toArray().length - 1).getName());
+ assertNull(fooList.get(fooList.toArray().length - 1)
+ .getName());
for (final Foo foo : fooList) {
- System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+ LOGGER.debug("Name: {}, Id: {}", foo.getName(), foo.getId());
}
}
@@ -77,9 +83,10 @@ public class FooSortingPersistenceIntegrationTest {
final String hql = "FROM Foo f ORDER BY f.name NULLS FIRST";
final Query query = session.createQuery(hql);
final List fooList = query.list();
- assertNull(fooList.get(0).getName());
+ assertNull(fooList.get(0)
+ .getName());
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName());
+ LOGGER.debug("Name: {}", foo.getName());
}
}
@@ -90,7 +97,7 @@ public class FooSortingPersistenceIntegrationTest {
final Query query = session.createQuery(hql);
final List fooList = query.list();
for (final Foo foo : fooList) {
- System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+ LOGGER.debug("Name: {}, Id: {}", foo.getName(), foo.getId());
}
}
@@ -100,7 +107,7 @@ public class FooSortingPersistenceIntegrationTest {
final Query query = session.createQuery(hql);
final List fooList = query.list();
for (final Foo foo : fooList) {
- System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+ LOGGER.debug("Name: {}, Id: {}", foo.getName(), foo.getId());
}
}
@@ -110,7 +117,7 @@ public class FooSortingPersistenceIntegrationTest {
final Query query = session.createQuery(hql);
final List fooList = query.list();
for (final Foo foo : fooList) {
- System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
+ LOGGER.debug("Name: {}, Id: {}", foo.getName(), foo.getId());
}
}
@@ -120,7 +127,7 @@ public class FooSortingPersistenceIntegrationTest {
criteria.addOrder(Order.asc("id"));
final List fooList = criteria.list();
for (final Foo foo : fooList) {
- System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+ LOGGER.debug("Id: {}, FirstName: {}", foo.getId(), foo.getName());
}
}
@@ -131,29 +138,33 @@ public class FooSortingPersistenceIntegrationTest {
criteria.addOrder(Order.asc("id"));
final List fooList = criteria.list();
for (final Foo foo : fooList) {
- System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+ LOGGER.debug("Id: {}, FirstName: {}", foo.getId(), foo.getName());
}
}
@Test
public final void whenCriteriaSortingStringNullsLastAsc_thenNullsLast() {
final Criteria criteria = session.createCriteria(Foo.class, "FOO");
- criteria.addOrder(Order.asc("name").nulls(NullPrecedence.LAST));
+ criteria.addOrder(Order.asc("name")
+ .nulls(NullPrecedence.LAST));
final List fooList = criteria.list();
- assertNull(fooList.get(fooList.toArray().length - 1).getName());
+ assertNull(fooList.get(fooList.toArray().length - 1)
+ .getName());
for (final Foo foo : fooList) {
- System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+ LOGGER.debug("Id: {}, FirstName: {}", foo.getId(), foo.getName());
}
}
@Test
public final void whenCriteriaSortingStringNullsFirstDesc_thenNullsFirst() {
final Criteria criteria = session.createCriteria(Foo.class, "FOO");
- criteria.addOrder(Order.desc("name").nulls(NullPrecedence.FIRST));
+ criteria.addOrder(Order.desc("name")
+ .nulls(NullPrecedence.FIRST));
final List fooList = criteria.list();
- assertNull(fooList.get(0).getName());
+ assertNull(fooList.get(0)
+ .getName());
for (final Foo foo : fooList) {
- System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName());
+ LOGGER.debug("Id: {}, FirstName: {}", foo.getId(), foo.getName());
}
}
@@ -164,9 +175,9 @@ public class FooSortingPersistenceIntegrationTest {
final List barList = query.list();
for (final Bar bar : barList) {
final Set fooSet = bar.getFooSet();
- System.out.println("Bar Id:" + bar.getId());
+ LOGGER.debug("Bar Id:{}", bar.getId());
for (final Foo foo : fooSet) {
- System.out.println("FooName:" + foo.getName());
+ LOGGER.debug("FooName:{}", foo.getName());
}
}
}
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java
index 5a73e39ca2..8c766954ff 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java
@@ -1,7 +1,10 @@
package com.baeldung.persistence.service;
+import com.baeldung.persistence.hibernate.FooSortingPersistenceIntegrationTest;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.test.context.ContextConfiguration;
@@ -16,6 +19,8 @@ import com.baeldung.spring.config.PersistenceTestConfig;
@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
public class ParentServicePersistenceIntegrationTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ParentServicePersistenceIntegrationTest.class);
+
@Autowired
private IParentService service;
@@ -37,11 +42,11 @@ public class ParentServicePersistenceIntegrationTest {
final Parent parentEntity = new Parent(childEntity);
service.create(parentEntity);
- System.out.println("Child = " + childService.findOne(childEntity.getId()));
- System.out.println("Child - parent = " + childService.findOne(childEntity.getId()).getParent());
+ LOGGER.debug("Child = {}", childService.findOne(childEntity.getId()));
+ LOGGER.debug("Child - parent = {}", childService.findOne(childEntity.getId()).getParent());
- System.out.println("Parent = " + service.findOne(parentEntity.getId()));
- System.out.println("Parent - child = " + service.findOne(parentEntity.getId()).getChild());
+ LOGGER.debug("Parent = {}", service.findOne(parentEntity.getId()));
+ LOGGER.debug("Parent - child = {}", service.findOne(parentEntity.getId()).getChild());
}
@Test(expected = DataIntegrityViolationException.class)
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/config/PersistenceTestConfig.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/config/PersistenceTestConfig.java
index 34301741fe..c8f14c5563 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/config/PersistenceTestConfig.java
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/config/PersistenceTestConfig.java
@@ -166,7 +166,7 @@ public class PersistenceTestConfig {
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
- hibernateProperties.setProperty("hibernate.show_sql", "true");
+ hibernateProperties.setProperty("hibernate.show_sql", "false");
// hibernateProperties.setProperty("hibernate.format_sql", "true");
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java
index a9ab13feed..df07c74c5a 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java
@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@RunWith(SpringRunner.class)
-@DataJpaTest(properties = "spring.sql.init.data-locations=classpath:insert_users.sql")
+@DataJpaTest(properties = "spring.sql.init.data-locations=classpath:insert_users.sql", showSql = false)
public class UserRepositoryIntegrationTest {
@Autowired
@@ -40,46 +40,42 @@ public class UserRepositoryIntegrationTest {
@Test
public void whenFindAllSortedByNameThenAllSorted() {
List allUsersSortedByName = userRepository.findAll(Sort.by(Sort.Direction.ASC, "name"));
- assertThat(allUsersSortedByName)
- .extracting("name")
+ assertThat(allUsersSortedByName).extracting("name")
.containsSequence("Bob", "Cindy", "John");
}
@Test
public void whenFindAllSortedByNameLengthThenException() {
- assertThatThrownBy(() -> userRepository.findAll(Sort.by("LENGTH(name)")))
- .isInstanceOf(PropertyReferenceException.class);
+ assertThatThrownBy(() -> userRepository.findAll(Sort.by("LENGTH(name)"))).isInstanceOf(PropertyReferenceException.class);
}
@Test
public void whenFindAllUsersSortedByNameThenAllSorted() {
List allUsersSortedByName = userRepository.findAllUsers(Sort.by(Sort.Direction.ASC, "name"));
- assertThat(allUsersSortedByName)
- .extracting("name")
+ assertThat(allUsersSortedByName).extracting("name")
.containsSequence("Bob", "Cindy", "John");
}
@Test
public void whenFindAllUsersSortedByNameLengthThenAllSorted() {
List allUsersSortedByName = userRepository.findAllUsers(JpaSort.unsafe("LENGTH(name)"));
- assertThat(allUsersSortedByName)
- .extracting("name")
+ assertThat(allUsersSortedByName).extracting("name")
.containsSequence("Bob", "John", "Cindy");
}
@Test
public void whenFindAllUsersWithPaginationThenPaginated() {
Page page = userRepository.findAllUsersWithPagination(PageRequest.of(0, 1));
- assertThat(page.stream().map(User::getId))
- .hasSize(1)
+ assertThat(page.stream()
+ .map(User::getId)).hasSize(1)
.containsOnly(1);
}
@Test
public void whenFindAllUsersWithPaginationNativeThenPaginated() {
Page page = userRepository.findAllUsersWithPaginationNative(PageRequest.of(1, 1));
- assertThat(page.stream().map(User::getId))
- .hasSize(1)
+ assertThat(page.stream()
+ .map(User::getId)).hasSize(1)
.containsOnly(2);
}
@@ -126,8 +122,7 @@ public class UserRepositoryIntegrationTest {
@Test
public void whenFindUserByNameListThenAllFound() {
List users = userRepository.findUserByNameList(Arrays.asList("Bob", "Cindy"));
- assertThat(users)
- .extracting("name")
+ assertThat(users).extracting("name")
.containsOnly("Bob", "Cindy");
}
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java
index e00a340615..b97fbc5275 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@RunWith(SpringRunner.class)
-@DataJpaTest(properties="spring.sql.init.data-locations=classpath:import_entities.sql")
+@DataJpaTest(properties="spring.sql.init.data-locations=classpath:import_entities.sql", showSql = false)
public class ArticleRepositoryIntegrationTest {
@Autowired
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetching.cfg.xml b/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetching.cfg.xml
index 55a3aeb51c..4d3ff2ae63 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetching.cfg.xml
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetching.cfg.xml
@@ -11,7 +11,7 @@
org.hibernate.dialect.H2Dialect
update
- true
+ false
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetchingLazy.cfg.xml b/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetchingLazy.cfg.xml
index 8fcf578660..8a2bf593cb 100644
--- a/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetchingLazy.cfg.xml
+++ b/persistence-modules/spring-data-jpa-query-2/src/test/resources/fetchingLazy.cfg.xml
@@ -11,7 +11,7 @@
org.hibernate.dialect.H2Dialect
update
- true
+ false
diff --git a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/aggregation/SpringDataAggregateIntegrationTest.java b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/aggregation/SpringDataAggregateIntegrationTest.java
index 779ade7a3f..a73ad949db 100644
--- a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/aggregation/SpringDataAggregateIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/aggregation/SpringDataAggregateIntegrationTest.java
@@ -16,8 +16,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@RunWith(SpringRunner.class)
-@DataJpaTest
-
+@DataJpaTest(showSql = false)
@Sql(scripts = "/test-aggregation-data.sql")
public class SpringDataAggregateIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java
index f082350019..d80380854d 100644
--- a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java
@@ -26,8 +26,7 @@ import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-
-@DataJpaTest
+@DataJpaTest(showSql = false)
@RunWith(SpringRunner.class)
public class PassengerRepositoryIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java
index 24880a5dff..b6bf51ac65 100644
--- a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/entitygraph/EntityGraphIntegrationTest.java
@@ -14,7 +14,7 @@ import com.baeldung.entitygraph.model.Item;
import com.baeldung.entitygraph.repository.CharacteristicsRepository;
import com.baeldung.entitygraph.repository.ItemRepository;
-@DataJpaTest
+@DataJpaTest(showSql = false)
@RunWith(SpringRunner.class)
@Sql(scripts = "/entitygraph-data.sql")
public class EntityGraphIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java
index d99f6671a3..c740fd7abd 100644
--- a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.Arrays;
@@ -19,6 +20,7 @@ import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatc
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class})
+@TestPropertySource(properties = {"spring.jpa.show-sql=false"})
public class CarRepositoryIntegrationTest {
@Autowired
diff --git a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/joins/JpaJoinsIntegrationTest.java b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/joins/JpaJoinsIntegrationTest.java
index 9b0d23f3e4..e24b2ae4b7 100644
--- a/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/joins/JpaJoinsIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/joins/JpaJoinsIntegrationTest.java
@@ -13,10 +13,11 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
-@DataJpaTest
+@DataJpaTest(showSql = false)
@ActiveProfiles("joins")
public class JpaJoinsIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa-query/src/test/resources/logback-test.xml b/persistence-modules/spring-data-jpa-query/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-query/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/saveperformance/BookApplication.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/saveperformance/BookApplication.java
index 56ad918be3..46cb8d3453 100644
--- a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/saveperformance/BookApplication.java
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/saveperformance/BookApplication.java
@@ -1,5 +1,7 @@
package com.baeldung.spring.data.persistence.saveperformance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -12,6 +14,8 @@ import java.util.List;
@SpringBootApplication
public class BookApplication {
+ private static final Logger LOGGER = LoggerFactory.getLogger(BookApplication.class);
+
@Autowired
private BookRepository bookRepository;
@@ -25,13 +29,13 @@ public class BookApplication {
int bookCount = 10000;
long start = System.currentTimeMillis();
- for(int i = 0; i < bookCount; i++) {
+ for (int i = 0; i < bookCount; i++) {
bookRepository.save(new Book("Book " + i, "Author " + i));
}
long end = System.currentTimeMillis();
bookRepository.deleteAll();
- System.out.println("It took " + (end - start) + "ms to execute save() for " + bookCount + " books");
+ LOGGER.debug("It took {}ms to execute save() for {} books.", (end - start), bookCount);
List bookList = new ArrayList<>();
for (int i = 0; i < bookCount; i++) {
@@ -42,7 +46,7 @@ public class BookApplication {
bookRepository.saveAll(bookList);
end = System.currentTimeMillis();
- System.out.println("It took " + (end - start) + "ms to execute saveAll() with " + bookCount + " books\n");
+ LOGGER.debug("It took {}ms to execute saveAll() with {}} books.", (end - start), bookCount);
}
}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/test/resources/logback-test.xml b/persistence-modules/spring-data-jpa-repo-2/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/InventoryRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/InventoryRepositoryIntegrationTest.java
index e4bd3dabff..9201df8990 100644
--- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/InventoryRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/InventoryRepositoryIntegrationTest.java
@@ -19,7 +19,7 @@ import com.baeldung.Application;
import com.baeldung.boot.domain.MerchandiseEntity;
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
+@SpringBootTest(classes = Application.class, properties = {"spring.jpa.show-sql=false"})
public class InventoryRepositoryIntegrationTest {
private static final String ORIGINAL_TITLE = "Pair of Pants";
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java
index fe02f79a56..34de77a2b3 100644
--- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java
@@ -21,7 +21,7 @@ import com.baeldung.boot.domain.Location;
import com.baeldung.boot.domain.Store;
@RunWith(SpringRunner.class)
-@DataJpaTest(properties="spring.sql.init.data-locations=classpath:import_entities.sql")
+@DataJpaTest(properties="spring.sql.init.data-locations=classpath:import_entities.sql", showSql = false)
public class JpaRepositoriesIntegrationTest {
@Autowired
private LocationRepository locationRepository;
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryIntegrationTest.java
index 2a6e166b88..41c171e449 100644
--- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/derivedquery/repository/UserRepositoryIntegrationTest.java
@@ -17,7 +17,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = QueryApplication.class)
+@SpringBootTest(classes = QueryApplication.class, properties = {"spring.jpa.show-sql=false"})
public class UserRepositoryIntegrationTest {
private static final String USER_NAME_ADAM = "Adam";
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java
index cc96b638ab..a4a1982df8 100644
--- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/like/MovieRepositoryIntegrationTest.java
@@ -16,7 +16,7 @@ import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TES
@RunWith(SpringRunner.class)
@Sql(scripts = { "/test-movie-data.sql" })
-@SpringBootTest(classes = LikeApplication.class)
+@SpringBootTest(classes = LikeApplication.class, properties = {"spring.jpa.show-sql=false"})
@Sql(scripts = "/test-movie-cleanup.sql", executionPhase = AFTER_TEST_METHOD)
public class MovieRepositoryIntegrationTest {
@Autowired
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/FruitPopulatorIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/FruitPopulatorIntegrationTest.java
index 4d3661e717..d0b2ab8dd7 100644
--- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/FruitPopulatorIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/FruitPopulatorIntegrationTest.java
@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import com.baeldung.entity.Fruit;
@RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(properties = {"spring.jpa.show-sql=false"})
public class FruitPopulatorIntegrationTest {
@Autowired
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/PassengerRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/PassengerRepositoryIntegrationTest.java
index 37fcef7dab..fd06710084 100644
--- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/PassengerRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/PassengerRepositoryIntegrationTest.java
@@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import com.baeldung.entity.Passenger;
-@DataJpaTest
+@DataJpaTest(showSql = false)
@RunWith(SpringRunner.class)
public class PassengerRepositoryIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/SongRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/SongRepositoryIntegrationTest.java
index 19362acd44..619b410f0d 100644
--- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/SongRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/repository/SongRepositoryIntegrationTest.java
@@ -16,7 +16,7 @@ import com.baeldung.entity.Song;
import com.baeldung.repository.SongRepository;
@RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(properties = {"spring.jpa.show-sql=false"})
@Sql(scripts = { "/test-song-data.sql" })
public class SongRepositoryIntegrationTest {
diff --git a/persistence-modules/spring-data-jpa-repo/src/test/resources/logback-test.xml b/persistence-modules/spring-data-jpa-repo/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
index 4871a3d1e2..23e28a9e3b 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
@@ -74,7 +74,7 @@ public class DynamicUpdateConfig {
Properties properties = new Properties();
properties.setProperty("hibernate.hbm2ddl.auto", Preconditions.checkNotNull(env.getProperty("hibernate.hbm2ddl.auto")));
properties.setProperty("hibernate.dialect", Preconditions.checkNotNull(env.getProperty("hibernate.dialect")));
- properties.setProperty("hibernate.show_sql", "true");
+ properties.setProperty("hibernate.show_sql", "false");
return properties;
}
}
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java
index 722f0251d1..25d7de4b07 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/immutable/util/HibernateUtil.java
@@ -6,8 +6,12 @@ import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.service.ServiceRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HibernateUtil {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(HibernateUtil.class);
private static final SessionFactory sessionFactory = buildSessionFactory();
private static SessionFactory buildSessionFactory() {
@@ -17,10 +21,11 @@ public class HibernateUtil {
configuration.addAnnotatedClass(Event.class);
configuration.addAnnotatedClass(EventGeneratedId.class);
configuration.configure("immutable.cfg.xml");
- ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
+ ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties())
+ .build();
return configuration.buildSessionFactory(serviceRegistry);
} catch (Throwable ex) {
- System.out.println("Initial SessionFactory creation failed." + ex);
+ LOGGER.debug("Initial SessionFactory creation failed.", ex);
throw new ExceptionInInitializerError(ex);
}
}
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/manytomany/util/HibernateUtil.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/manytomany/util/HibernateUtil.java
index 5f489dd027..29e8d7515a 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/manytomany/util/HibernateUtil.java
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/manytomany/util/HibernateUtil.java
@@ -6,8 +6,12 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.service.ServiceRegistry;
import com.baeldung.hibernate.manytomany.model.Employee;
import com.baeldung.hibernate.manytomany.model.Project;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HibernateUtil {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(HibernateUtil.class);
private static SessionFactory sessionFactory;
private static SessionFactory buildSessionFactory() {
@@ -17,25 +21,25 @@ public class HibernateUtil {
configuration.addAnnotatedClass(Employee.class);
configuration.addAnnotatedClass(Project.class);
configuration.configure("manytomany.cfg.xml");
- System.out.println("Hibernate Annotation Configuration loaded");
+ LOGGER.debug("Hibernate Annotation Configuration loaded");
ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties())
- .build();
- System.out.println("Hibernate Annotation serviceRegistry created");
+ .build();
+ LOGGER.debug("Hibernate Annotation serviceRegistry created");
SessionFactory sessionFactory = configuration.buildSessionFactory(serviceRegistry);
return sessionFactory;
} catch (Throwable ex) {
- System.err.println("Initial SessionFactory creation failed." + ex);
- ex.printStackTrace();
+ LOGGER.error("Initial SessionFactory creation failed.", ex);
throw new ExceptionInInitializerError(ex);
}
}
public static SessionFactory getSessionFactory() {
- if (sessionFactory == null)
+ if (sessionFactory == null) {
sessionFactory = buildSessionFactory();
+ }
return sessionFactory;
}
}
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/manytomany/spring/PersistenceConfig.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/manytomany/spring/PersistenceConfig.java
index 44cbfadb25..b8e7e1b2fd 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/manytomany/spring/PersistenceConfig.java
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/manytomany/spring/PersistenceConfig.java
@@ -63,7 +63,7 @@ public class PersistenceConfig {
final Properties hibernateProperties = new Properties();
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
- hibernateProperties.setProperty("hibernate.show_sql", "true");
+ hibernateProperties.setProperty("hibernate.show_sql", "false");
return hibernateProperties;
}
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/spring/PersistenceConfig.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/spring/PersistenceConfig.java
index 74ac0a269e..159d6e2e8e 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/spring/PersistenceConfig.java
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/spring/PersistenceConfig.java
@@ -71,7 +71,7 @@ public class PersistenceConfig {
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
- hibernateProperties.setProperty("hibernate.show_sql", "true");
+ hibernateProperties.setProperty("hibernate.show_sql", "false");
// Envers properties
hibernateProperties.setProperty("org.hibernate.envers.audit_table_suffix", env.getProperty("envers.audit_table_suffix"));
diff --git a/persistence-modules/spring-hibernate-5/src/main/resources/immutable.cfg.xml b/persistence-modules/spring-hibernate-5/src/main/resources/immutable.cfg.xml
index a572ebeac2..4e55b4632f 100644
--- a/persistence-modules/spring-hibernate-5/src/main/resources/immutable.cfg.xml
+++ b/persistence-modules/spring-hibernate-5/src/main/resources/immutable.cfg.xml
@@ -23,7 +23,7 @@
thread
- true
+ false
update
diff --git a/persistence-modules/spring-hibernate-5/src/main/resources/manytomany.cfg.xml b/persistence-modules/spring-hibernate-5/src/main/resources/manytomany.cfg.xml
index 3c753a89af..315e2e3118 100644
--- a/persistence-modules/spring-hibernate-5/src/main/resources/manytomany.cfg.xml
+++ b/persistence-modules/spring-hibernate-5/src/main/resources/manytomany.cfg.xml
@@ -10,6 +10,6 @@
tutorialuser
org.hibernate.dialect.MySQLDialect
thread
- true
+ false
diff --git a/persistence-modules/spring-hibernate-5/src/test/resources/manytomany.cfg.xml b/persistence-modules/spring-hibernate-5/src/test/resources/manytomany.cfg.xml
index a7a23ec70d..2ca23d57d3 100644
--- a/persistence-modules/spring-hibernate-5/src/test/resources/manytomany.cfg.xml
+++ b/persistence-modules/spring-hibernate-5/src/test/resources/manytomany.cfg.xml
@@ -10,7 +10,7 @@
sa
org.hibernate.dialect.H2Dialect
thread
- true
+ false
create-drop
diff --git a/persistence-modules/spring-jdbc/src/test/java/com/baeldung/spring/jdbc/template/guide/EmployeeDAOIntegrationTest.java b/persistence-modules/spring-jdbc/src/test/java/com/baeldung/spring/jdbc/template/guide/EmployeeDAOIntegrationTest.java
index c29d5c4534..b382895143 100644
--- a/persistence-modules/spring-jdbc/src/test/java/com/baeldung/spring/jdbc/template/guide/EmployeeDAOIntegrationTest.java
+++ b/persistence-modules/spring-jdbc/src/test/java/com/baeldung/spring/jdbc/template/guide/EmployeeDAOIntegrationTest.java
@@ -9,6 +9,8 @@ import com.baeldung.spring.jdbc.template.guide.config.SpringJdbcConfig;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.test.context.ContextConfiguration;
@@ -19,6 +21,8 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
@ContextConfiguration(classes = { SpringJdbcConfig.class }, loader = AnnotationConfigContextLoader.class)
public class EmployeeDAOIntegrationTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(EmployeeDAOIntegrationTest.class);
+
@Autowired
private EmployeeDAO employeeDao;
@@ -70,7 +74,7 @@ public class EmployeeDAOIntegrationTest {
try {
employeeDao.addEmplyee(7);
} catch (final DuplicateKeyException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage(), e);
Assert.assertTrue(e.getMessage().contains("Custome Exception translator - Integrity contraint voilation."));
}
}
diff --git a/persistence-modules/spring-jdbc/src/test/resources/logback-test.xml b/persistence-modules/spring-jdbc/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-jdbc/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-jpa-2/src/main/resources/persistence-h2.properties b/persistence-modules/spring-jpa-2/src/main/resources/persistence-h2.properties
index 716a96fde3..b429ce3a16 100644
--- a/persistence-modules/spring-jpa-2/src/main/resources/persistence-h2.properties
+++ b/persistence-modules/spring-jpa-2/src/main/resources/persistence-h2.properties
@@ -6,7 +6,7 @@ jdbc.pass=
# hibernate.X
hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
hibernate.hbm2ddl.auto=create-drop
hibernate.cache.use_second_level_cache=true
hibernate.cache.use_query_cache=true
diff --git a/persistence-modules/spring-jpa-2/src/test/resources/logback-test.xml b/persistence-modules/spring-jpa-2/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..8d4771e308
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/persistence-modules/spring-jpa-2/src/test/resources/manytomany/test.properties b/persistence-modules/spring-jpa-2/src/test/resources/manytomany/test.properties
index 9e4236a6c2..db92a1b8c1 100644
--- a/persistence-modules/spring-jpa-2/src/test/resources/manytomany/test.properties
+++ b/persistence-modules/spring-jpa-2/src/test/resources/manytomany/test.properties
@@ -2,5 +2,5 @@ jdbc.driverClassName=org.h2.Driver
jdbc.url=jdbc:h2:mem:myDb;DB_CLOSE_DELAY=-1
hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
hibernate.hbm2ddl.auto=validate
diff --git a/persistence-modules/spring-jpa/src/main/resources/persistence-h2.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-h2.properties
index a3060cc796..72b51f02b7 100644
--- a/persistence-modules/spring-jpa/src/main/resources/persistence-h2.properties
+++ b/persistence-modules/spring-jpa/src/main/resources/persistence-h2.properties
@@ -6,5 +6,5 @@ jdbc.pass=
# hibernate.X
hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file
diff --git a/persistence-modules/spring-jpa/src/main/resources/persistence-student-h2.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-student-h2.properties
index 405e6ff109..a5d2bec189 100644
--- a/persistence-modules/spring-jpa/src/main/resources/persistence-student-h2.properties
+++ b/persistence-modules/spring-jpa/src/main/resources/persistence-student-h2.properties
@@ -6,7 +6,7 @@ jdbc.pass=
# hibernate.X
hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
hibernate.hbm2ddl.auto=create-drop
hibernate.cache.use_second_level_cache=false
hibernate.cache.use_query_cache=false
\ No newline at end of file
diff --git a/persistence-modules/spring-jpa/src/main/resources/persistence-student.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-student.properties
index d4c82420de..9a06518238 100644
--- a/persistence-modules/spring-jpa/src/main/resources/persistence-student.properties
+++ b/persistence-modules/spring-jpa/src/main/resources/persistence-student.properties
@@ -4,7 +4,7 @@ jdbc.user=tutorialuser
jdbc.pass=tutorialpass
hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
hibernate.hbm2ddl.auto=create-drop
hibernate.cache.use_second_level_cache=false
diff --git a/persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml b/persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml
index 495f076fef..76a3b61399 100644
--- a/persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml
+++ b/persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java
index fbda459d65..66f20a6724 100644
--- a/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java
+++ b/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java
@@ -20,6 +20,8 @@ import com.baeldung.persistence.model.Foo;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -31,6 +33,8 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
@DirtiesContext
public class FooPaginationPersistenceIntegrationTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FooPaginationPersistenceIntegrationTest.class);
+
@PersistenceContext
private EntityManager entityManager;
@@ -137,7 +141,7 @@ public class FooPaginationPersistenceIntegrationTest {
typedQuery = entityManager.createQuery(select);
typedQuery.setFirstResult(pageNumber - 1);
typedQuery.setMaxResults(pageSize);
- System.out.println("Current page: " + typedQuery.getResultList());
+ LOGGER.debug("Current page: {}", typedQuery.getResultList());
pageNumber += pageSize;
}
diff --git a/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingIntegrationTest.java
index c3db45ab41..8d1f94edf8 100644
--- a/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingIntegrationTest.java
+++ b/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingIntegrationTest.java
@@ -15,6 +15,8 @@ import com.baeldung.persistence.model.Bar;
import com.baeldung.persistence.model.Foo;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -26,6 +28,8 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
@SuppressWarnings("unchecked")
public class FooServiceSortingIntegrationTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FooServiceSortingIntegrationTest.class);
+
@PersistenceContext
private EntityManager entityManager;
@@ -37,7 +41,7 @@ public class FooServiceSortingIntegrationTest {
final Query sortQuery = entityManager.createQuery(jql);
final List fooList = sortQuery.getResultList();
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+ LOGGER.debug("Name:{}-------Id:{}", foo.getName(), foo.getId());
}
}
@@ -47,7 +51,7 @@ public class FooServiceSortingIntegrationTest {
final Query sortQuery = entityManager.createQuery(jql);
final List fooList = sortQuery.getResultList();
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+ LOGGER.debug("Name:{}-------Id:{}", foo.getName(), foo.getId());
}
}
@@ -57,7 +61,7 @@ public class FooServiceSortingIntegrationTest {
final Query sortQuery = entityManager.createQuery(jql);
final List fooList = sortQuery.getResultList();
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+ LOGGER.debug("Name:{}-------Id:{}", foo.getName(), foo.getId());
}
}
@@ -67,9 +71,9 @@ public class FooServiceSortingIntegrationTest {
final Query barJoinQuery = entityManager.createQuery(jql);
final List fooList = barJoinQuery.getResultList();
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName());
+ LOGGER.debug("Name:{}", foo.getName());
if (foo.getBar() != null) {
- System.out.print("-------BarId:" + foo.getBar().getId());
+ LOGGER.debug("-------BarId:{}", foo.getBar().getId());
}
}
}
@@ -80,9 +84,9 @@ public class FooServiceSortingIntegrationTest {
final Query barQuery = entityManager.createQuery(jql);
final List barList = barQuery.getResultList();
for (final Bar bar : barList) {
- System.out.println("Bar Id:" + bar.getId());
+ LOGGER.debug("Bar Id:{}", bar.getId());
for (final Foo foo : bar.getFooList()) {
- System.out.println("FooName:" + foo.getName());
+ LOGGER.debug("FooName:{}", foo.getName());
}
}
}
@@ -97,7 +101,7 @@ public class FooServiceSortingIntegrationTest {
final TypedQuery typedQuery = entityManager.createQuery(select);
final List fooList = typedQuery.getResultList();
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName() + "--------Id:" + foo.getId());
+ LOGGER.debug("Name:{}-------Id:{}", foo.getName(), foo.getId());
}
}
@@ -111,7 +115,7 @@ public class FooServiceSortingIntegrationTest {
final TypedQuery typedQuery = entityManager.createQuery(select);
final List fooList = typedQuery.getResultList();
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId());
+ LOGGER.debug("Name:{}-------Id:{}", foo.getName(), foo.getId());
}
}
diff --git a/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java
index 103321fc64..b19259d9df 100644
--- a/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java
+++ b/persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java
@@ -13,6 +13,8 @@ import com.baeldung.config.PersistenceJPAConfig;
import com.baeldung.persistence.model.Foo;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -24,6 +26,8 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
@DirtiesContext
public class FooServiceSortingWitNullsManualIntegrationTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FooServiceSortingWitNullsManualIntegrationTest.class);
+
@PersistenceContext
private EntityManager entityManager;
@@ -43,7 +47,7 @@ public class FooServiceSortingWitNullsManualIntegrationTest {
final List fooList = sortQuery.getResultList();
assertNull(fooList.get(fooList.toArray().length - 1).getName());
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName());
+ LOGGER.debug("Name:{}", foo.getName());
}
}
@@ -57,7 +61,7 @@ public class FooServiceSortingWitNullsManualIntegrationTest {
final List fooList = sortQuery.getResultList();
assertNull(fooList.get(0).getName());
for (final Foo foo : fooList) {
- System.out.println("Name:" + foo.getName());
+ LOGGER.debug("Name:{}", foo.getName());
}
}
diff --git a/persistence-modules/spring-jpa/src/test/resources/persistence-student.properties b/persistence-modules/spring-jpa/src/test/resources/persistence-student.properties
index 3b6b580630..9ca389d6ab 100644
--- a/persistence-modules/spring-jpa/src/test/resources/persistence-student.properties
+++ b/persistence-modules/spring-jpa/src/test/resources/persistence-student.properties
@@ -2,7 +2,7 @@ jdbc.driverClassName=org.h2.Driver
jdbc.url=jdbc:h2:mem:myDb;DB_CLOSE_DELAY=-1
hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
hibernate.hbm2ddl.auto=create
hibernate.cache.use_second_level_cache=false
diff --git a/pom.xml b/pom.xml
index 6d10dcb668..e18e571372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -790,6 +790,9 @@
**/*IntegrationTest.java
**/*IntTest.java
+
+ ${tutorialsproject.basedir}/logback-config.xml
+
@@ -1047,6 +1050,9 @@
**/*IntegrationTest.java
**/*IntTest.java
+
+ ${tutorialsproject.basedir}/logback-config.xml
+