Merge pull request #11479 from chaos2418/JAVA-8435
JAVA-8435: reducing logging for tutorials-integration job
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="15 seconds" debug="false">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="15 seconds" debug="false">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
+1
-4
@@ -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();
|
||||
}
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="15 seconds" debug="false">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="15 seconds" debug="false">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
+19
-11
@@ -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,8 +41,9 @@ 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);
|
||||
@@ -47,15 +53,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();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -86,15 +93,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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+16
-12
@@ -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;
|
||||
|
||||
@@ -56,7 +60,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final Query query = session.createQuery(hql);
|
||||
final List<Foo> 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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +72,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
|
||||
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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,7 +83,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final List<Foo> fooList = query.list();
|
||||
assertNull(fooList.get(0).getName());
|
||||
for (final Foo foo : fooList) {
|
||||
System.out.println("Name:" + foo.getName());
|
||||
LOGGER.debug("Name: {}", foo.getName());
|
||||
|
||||
}
|
||||
}
|
||||
@@ -90,7 +94,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final Query query = session.createQuery(hql);
|
||||
final List<Foo> 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 +104,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final Query query = session.createQuery(hql);
|
||||
final List<Foo> 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 +114,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final Query query = session.createQuery(hql);
|
||||
final List<Foo> 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 +124,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
criteria.addOrder(Order.asc("id"));
|
||||
final List<Foo> 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,7 +135,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
criteria.addOrder(Order.asc("id"));
|
||||
final List<Foo> 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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,7 +146,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final List<Foo> fooList = criteria.list();
|
||||
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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,7 +157,7 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final List<Foo> fooList = criteria.list();
|
||||
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 +168,9 @@ public class FooSortingPersistenceIntegrationTest {
|
||||
final List<Bar> barList = query.list();
|
||||
for (final Bar bar : barList) {
|
||||
final Set<Foo> 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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+9
-4
@@ -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)
|
||||
|
||||
+1
-1
@@ -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");
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<property name="hibernate.connection.password"></property>
|
||||
<property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
|
||||
<property name="hibernate.hbm2ddl.auto">update</property>
|
||||
<property name="show_sql">true</property>
|
||||
<property name="show_sql">false</property>
|
||||
|
||||
<mapping class="com.baeldung.hibernate.fetching.model.UserEager" />
|
||||
<mapping class="com.baeldung.hibernate.fetching.model.OrderDetail" />
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<property name="hibernate.connection.password"></property>
|
||||
<property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
|
||||
<property name="hibernate.hbm2ddl.auto">update</property>
|
||||
<property name="show_sql">true</property>
|
||||
<property name="show_sql">false</property>
|
||||
<mapping class="com.baeldung.hibernate.fetching.model.UserLazy" />
|
||||
<mapping class="com.baeldung.hibernate.fetching.model.OrderDetail" />
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
spring.jpa.show-sql=true
|
||||
spring.jpa.show-sql=false
|
||||
spring.jpa.defer-datasource-initialization=true
|
||||
+1
-2
@@ -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 {
|
||||
|
||||
|
||||
+1
-2
@@ -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 {
|
||||
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
+1
@@ -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;
|
||||
|
||||
+2
-1
@@ -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 {
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="15 seconds" debug="false">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
+7
-3
@@ -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<Book> 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);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="15 seconds" debug="false">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
@@ -1,4 +1,4 @@
|
||||
spring.jpa.show-sql=true
|
||||
spring.jpa.show-sql=false
|
||||
spring.jpa.defer-datasource-initialization=true
|
||||
#MySql
|
||||
#spring.datasource.url=jdbc:mysql://localhost:3306/baeldung
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="15 seconds" debug="false">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
}
|
||||
+5
-1
@@ -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() {
|
||||
@@ -20,7 +24,7 @@ public class HibernateUtil {
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
+10
-6
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user