From 95aa9428b45607486cbf7115501f11d5c8ed51a9 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Thu, 3 Mar 2022 21:57:58 +0530 Subject: [PATCH 1/3] JAVA-10083 Create new module hibernate-queries from spring-hibernate-5 module --- .../hibernate-queries-2/.gitignore | 13 +++ .../hibernate-queries-2/README.md | 8 ++ .../hibernate-queries-2/pom.xml | 86 +++++++++++++++++++ .../hibernate/criteria/PersistenceConfig.java | 71 +++++++++++++++ .../hibernate/criteria/model/Item.java | 0 .../criteria/util/HibernateUtil.java | 0 .../criteria/view/ApplicationView.java | 2 +- .../src/main/resources/import-db.sql | 0 .../src/main/resources/logback.xml | 19 ++++ .../main/resources/persistence-h2.properties | 21 +++++ .../java/com/baeldung/SpringContextTest.java | 18 ++++ .../HibernateCriteriaIntegrationTest.java | 0 .../criteria/HibernateCriteriaTestRunner.java | 0 .../criteria/HibernateCriteriaTestSuite.java | 0 .../src/test/resources/.gitignore | 13 +++ .../hibernate/criteria/model/Item.hbm.xml | 0 .../src/test/resources/criteria.cfg.xml | 0 .../src/test/resources/import-db.sql | 0 .../spring-hibernate-5/README.md | 1 - 19 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 persistence-modules/hibernate-queries-2/.gitignore create mode 100644 persistence-modules/hibernate-queries-2/README.md create mode 100644 persistence-modules/hibernate-queries-2/pom.xml create mode 100644 persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/main/java/com/baeldung/hibernate/criteria/model/Item.java (100%) rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java (100%) rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java (99%) rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/main/resources/import-db.sql (100%) create mode 100644 persistence-modules/hibernate-queries-2/src/main/resources/logback.xml create mode 100644 persistence-modules/hibernate-queries-2/src/main/resources/persistence-h2.properties create mode 100644 persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/SpringContextTest.java rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java (100%) rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java (100%) rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java (100%) create mode 100644 persistence-modules/hibernate-queries-2/src/test/resources/.gitignore rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml (100%) rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/test/resources/criteria.cfg.xml (100%) rename persistence-modules/{spring-hibernate-5 => hibernate-queries-2}/src/test/resources/import-db.sql (100%) diff --git a/persistence-modules/hibernate-queries-2/.gitignore b/persistence-modules/hibernate-queries-2/.gitignore new file mode 100644 index 0000000000..83c05e60c8 --- /dev/null +++ b/persistence-modules/hibernate-queries-2/.gitignore @@ -0,0 +1,13 @@ +*.class + +#folders# +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* + +# Packaged files # +*.jar +*.war +*.ear \ No newline at end of file diff --git a/persistence-modules/hibernate-queries-2/README.md b/persistence-modules/hibernate-queries-2/README.md new file mode 100644 index 0000000000..276e08ef52 --- /dev/null +++ b/persistence-modules/hibernate-queries-2/README.md @@ -0,0 +1,8 @@ +## Hibernate 5 with Spring + +This module contains articles about JPA Criteria Queries. + +### Relevant articles + +- [JPA Criteria Queries](https://www.baeldung.com/hibernate-criteria-queries) + diff --git a/persistence-modules/hibernate-queries-2/pom.xml b/persistence-modules/hibernate-queries-2/pom.xml new file mode 100644 index 0000000000..58b1b23b06 --- /dev/null +++ b/persistence-modules/hibernate-queries-2/pom.xml @@ -0,0 +1,86 @@ + + + 4.0.0 + hibernate-queries-2 + 0.1-SNAPSHOT + hibernate-queries-2 + + + com.baeldung + persistence-modules + 1.0.0-SNAPSHOT + + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework.data + spring-data-jpa + ${org.springframework.data.version} + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.apache.tomcat + tomcat-dbcp + ${tomcat-dbcp.version} + + + + + com.google.guava + guava + ${guava.version} + + + + org.springframework + spring-test + ${org.springframework.version} + test + + + com.h2database + h2 + ${h2.version} + + + com.sun.xml.bind + jaxb-core + ${com.sun.xml.version} + + + javax.xml.bind + jaxb-api + ${javax.xml.bind.version} + + + com.sun.xml.bind + jaxb-impl + ${com.sun.xml.version} + + + + + + 5.0.2.RELEASE + 1.10.6.RELEASE + + 5.2.10.Final + 9.0.0.M26 + 2.3.4 + 2.3.0.1 + 2.3.1 + + + \ No newline at end of file diff --git a/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java b/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java new file mode 100644 index 0000000000..9239697952 --- /dev/null +++ b/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java @@ -0,0 +1,71 @@ +package com.baeldung.hibernate.criteria; + +import com.google.common.base.Preconditions; +import org.apache.tomcat.dbcp.dbcp2.BasicDataSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; +import org.springframework.orm.hibernate5.HibernateTransactionManager; +import org.springframework.orm.hibernate5.LocalSessionFactoryBean; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.sql.DataSource; +import java.util.Properties; + +@Configuration +@EnableTransactionManagement +@PropertySource({ "classpath:persistence-h2.properties" }) +@ComponentScan({ "com.baeldung.hibernate.criteria" }) +public class PersistenceConfig { + + @Autowired + private Environment env; + + @Bean + public LocalSessionFactoryBean sessionFactory() { + final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean(); + sessionFactory.setDataSource(dataSource()); + sessionFactory.setPackagesToScan(new String[] { "com.baeldung.hibernate.criteria" }); + sessionFactory.setHibernateProperties(hibernateProperties()); + + return sessionFactory; + } + + @Bean + public DataSource dataSource() { + final BasicDataSource dataSource = new BasicDataSource(); + dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); + dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url"))); + dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user"))); + dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass"))); + + return dataSource; + } + + @Bean + public PlatformTransactionManager hibernateTransactionManager() { + final HibernateTransactionManager transactionManager = new HibernateTransactionManager(); + transactionManager.setSessionFactory(sessionFactory().getObject()); + return transactionManager; + } + + @Bean + public PersistenceExceptionTranslationPostProcessor exceptionTranslation() { + return new PersistenceExceptionTranslationPostProcessor(); + } + + private final Properties hibernateProperties() { + 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", "false"); + + return hibernateProperties; + } + +} \ No newline at end of file diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java b/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/model/Item.java similarity index 100% rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java rename to persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/model/Item.java diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java b/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java similarity index 100% rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java rename to persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java b/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java similarity index 99% rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java rename to persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java index c7ca9f1ffd..248f64474a 100644 --- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java +++ b/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java @@ -24,7 +24,7 @@ import com.baeldung.hibernate.criteria.model.Item; import com.baeldung.hibernate.criteria.util.HibernateUtil; public class ApplicationView { - + // default Constructor public ApplicationView() { diff --git a/persistence-modules/spring-hibernate-5/src/main/resources/import-db.sql b/persistence-modules/hibernate-queries-2/src/main/resources/import-db.sql similarity index 100% rename from persistence-modules/spring-hibernate-5/src/main/resources/import-db.sql rename to persistence-modules/hibernate-queries-2/src/main/resources/import-db.sql diff --git a/persistence-modules/hibernate-queries-2/src/main/resources/logback.xml b/persistence-modules/hibernate-queries-2/src/main/resources/logback.xml new file mode 100644 index 0000000000..ec0dc2469a --- /dev/null +++ b/persistence-modules/hibernate-queries-2/src/main/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + web - %date [%thread] %-5level %logger{36} - %message%n + + + + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-modules/hibernate-queries-2/src/main/resources/persistence-h2.properties b/persistence-modules/hibernate-queries-2/src/main/resources/persistence-h2.properties new file mode 100644 index 0000000000..e3544d354a --- /dev/null +++ b/persistence-modules/hibernate-queries-2/src/main/resources/persistence-h2.properties @@ -0,0 +1,21 @@ +# jdbc.X +jdbc.driverClassName=org.h2.Driver +jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +jdbc.eventGeneratedId=sa +jdbc.user=sa +jdbc.pass= + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=false +hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=true +hibernate.cache.use_query_cache=true +hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory + +# hibernate.search.X +hibernate.search.default.directory_provider = filesystem +hibernate.search.default.indexBase = /data/index/default + +# envers.X +envers.audit_table_suffix=_audit_log diff --git a/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/SpringContextTest.java new file mode 100644 index 0000000000..6503454abf --- /dev/null +++ b/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/SpringContextTest.java @@ -0,0 +1,18 @@ +package com.baeldung; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +import com.baeldung.hibernate.criteria.PersistenceConfig; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) +public class SpringContextTest { + + @Test + public void whenSpringContextIsBootstrapped_thenNoExceptions() { + } +} diff --git a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java b/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java similarity index 100% rename from persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java rename to persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java diff --git a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java b/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java similarity index 100% rename from persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java rename to persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java diff --git a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java b/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java similarity index 100% rename from persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java rename to persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java diff --git a/persistence-modules/hibernate-queries-2/src/test/resources/.gitignore b/persistence-modules/hibernate-queries-2/src/test/resources/.gitignore new file mode 100644 index 0000000000..83c05e60c8 --- /dev/null +++ b/persistence-modules/hibernate-queries-2/src/test/resources/.gitignore @@ -0,0 +1,13 @@ +*.class + +#folders# +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* + +# Packaged files # +*.jar +*.war +*.ear \ No newline at end of file diff --git a/persistence-modules/spring-hibernate-5/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml b/persistence-modules/hibernate-queries-2/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml similarity index 100% rename from persistence-modules/spring-hibernate-5/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml rename to persistence-modules/hibernate-queries-2/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml diff --git a/persistence-modules/spring-hibernate-5/src/test/resources/criteria.cfg.xml b/persistence-modules/hibernate-queries-2/src/test/resources/criteria.cfg.xml similarity index 100% rename from persistence-modules/spring-hibernate-5/src/test/resources/criteria.cfg.xml rename to persistence-modules/hibernate-queries-2/src/test/resources/criteria.cfg.xml diff --git a/persistence-modules/spring-hibernate-5/src/test/resources/import-db.sql b/persistence-modules/hibernate-queries-2/src/test/resources/import-db.sql similarity index 100% rename from persistence-modules/spring-hibernate-5/src/test/resources/import-db.sql rename to persistence-modules/hibernate-queries-2/src/test/resources/import-db.sql diff --git a/persistence-modules/spring-hibernate-5/README.md b/persistence-modules/spring-hibernate-5/README.md index 9770fe95af..124d71a21e 100644 --- a/persistence-modules/spring-hibernate-5/README.md +++ b/persistence-modules/spring-hibernate-5/README.md @@ -5,7 +5,6 @@ This module contains articles about Hibernate 5 with Spring. ### Relevant articles - [Programmatic Transactions in the Spring TestContext Framework](https://www.baeldung.com/spring-test-programmatic-transactions) -- [JPA Criteria Queries](https://www.baeldung.com/hibernate-criteria-queries) - [Introduction to Hibernate Search](https://www.baeldung.com/hibernate-search) - [@DynamicUpdate with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-dynamicupdate) - [Hibernate Second-Level Cache](http://www.baeldung.com/hibernate-second-level-cache) From 0f920f8c79261ba84f8c57bb1775481e996db65f Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Sat, 12 Mar 2022 10:38:34 +0530 Subject: [PATCH 2/3] JAVA-10083 --- .../hibernate-queries-2/.gitignore | 13 --- .../hibernate-queries-2/README.md | 8 -- .../hibernate-queries-2/pom.xml | 86 ------------------- .../src/main/resources/logback.xml | 19 ---- .../src/test/resources/.gitignore | 13 --- .../hibernate-queries/README.md | 1 + persistence-modules/hibernate-queries/pom.xml | 59 ++++++++++++- .../hibernate/criteria/PersistenceConfig.java | 0 .../hibernate/criteria/model/Item.java | 0 .../criteria/util/HibernateUtil.java | 0 .../criteria/view/ApplicationView.java | 0 .../src/main/resources/import-db.sql | 0 .../src/main/resources/logback.xml | 6 ++ .../main/resources/persistence-h2.properties | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../HibernateCriteriaIntegrationTest.java | 0 .../criteria/HibernateCriteriaTestRunner.java | 0 .../criteria/HibernateCriteriaTestSuite.java | 0 .../hibernate/criteria/model/Item.hbm.xml | 0 .../src/test/resources/criteria.cfg.xml | 0 .../src/test/resources/import-db.sql | 0 21 files changed, 65 insertions(+), 140 deletions(-) delete mode 100644 persistence-modules/hibernate-queries-2/.gitignore delete mode 100644 persistence-modules/hibernate-queries-2/README.md delete mode 100644 persistence-modules/hibernate-queries-2/pom.xml delete mode 100644 persistence-modules/hibernate-queries-2/src/main/resources/logback.xml delete mode 100644 persistence-modules/hibernate-queries-2/src/test/resources/.gitignore rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/main/java/com/baeldung/hibernate/criteria/model/Item.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/main/resources/import-db.sql (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/main/resources/persistence-h2.properties (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/test/resources/criteria.cfg.xml (100%) rename persistence-modules/{hibernate-queries-2 => hibernate-queries}/src/test/resources/import-db.sql (100%) diff --git a/persistence-modules/hibernate-queries-2/.gitignore b/persistence-modules/hibernate-queries-2/.gitignore deleted file mode 100644 index 83c05e60c8..0000000000 --- a/persistence-modules/hibernate-queries-2/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.class - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* - -# Packaged files # -*.jar -*.war -*.ear \ No newline at end of file diff --git a/persistence-modules/hibernate-queries-2/README.md b/persistence-modules/hibernate-queries-2/README.md deleted file mode 100644 index 276e08ef52..0000000000 --- a/persistence-modules/hibernate-queries-2/README.md +++ /dev/null @@ -1,8 +0,0 @@ -## Hibernate 5 with Spring - -This module contains articles about JPA Criteria Queries. - -### Relevant articles - -- [JPA Criteria Queries](https://www.baeldung.com/hibernate-criteria-queries) - diff --git a/persistence-modules/hibernate-queries-2/pom.xml b/persistence-modules/hibernate-queries-2/pom.xml deleted file mode 100644 index 58b1b23b06..0000000000 --- a/persistence-modules/hibernate-queries-2/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - 4.0.0 - hibernate-queries-2 - 0.1-SNAPSHOT - hibernate-queries-2 - - - com.baeldung - persistence-modules - 1.0.0-SNAPSHOT - - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework.data - spring-data-jpa - ${org.springframework.data.version} - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.apache.tomcat - tomcat-dbcp - ${tomcat-dbcp.version} - - - - - com.google.guava - guava - ${guava.version} - - - - org.springframework - spring-test - ${org.springframework.version} - test - - - com.h2database - h2 - ${h2.version} - - - com.sun.xml.bind - jaxb-core - ${com.sun.xml.version} - - - javax.xml.bind - jaxb-api - ${javax.xml.bind.version} - - - com.sun.xml.bind - jaxb-impl - ${com.sun.xml.version} - - - - - - 5.0.2.RELEASE - 1.10.6.RELEASE - - 5.2.10.Final - 9.0.0.M26 - 2.3.4 - 2.3.0.1 - 2.3.1 - - - \ No newline at end of file diff --git a/persistence-modules/hibernate-queries-2/src/main/resources/logback.xml b/persistence-modules/hibernate-queries-2/src/main/resources/logback.xml deleted file mode 100644 index ec0dc2469a..0000000000 --- a/persistence-modules/hibernate-queries-2/src/main/resources/logback.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - web - %date [%thread] %-5level %logger{36} - %message%n - - - - - - - - - - - - - - \ No newline at end of file diff --git a/persistence-modules/hibernate-queries-2/src/test/resources/.gitignore b/persistence-modules/hibernate-queries-2/src/test/resources/.gitignore deleted file mode 100644 index 83c05e60c8..0000000000 --- a/persistence-modules/hibernate-queries-2/src/test/resources/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.class - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* - -# Packaged files # -*.jar -*.war -*.ear \ No newline at end of file diff --git a/persistence-modules/hibernate-queries/README.md b/persistence-modules/hibernate-queries/README.md index 58ca74cd24..f1bc1cba0f 100644 --- a/persistence-modules/hibernate-queries/README.md +++ b/persistence-modules/hibernate-queries/README.md @@ -4,6 +4,7 @@ This module contains articles about use of Queries in Hibernate. ### Relevant articles: +- [JPA Criteria Queries](https://www.baeldung.com/hibernate-criteria-queries) - [Criteria Queries Using JPA Metamodel](https://www.baeldung.com/hibernate-criteria-queries-metamodel) - [Get All Data from a Table with Hibernate](https://www.baeldung.com/hibernate-select-all) - [Hibernate Named Query](https://www.baeldung.com/hibernate-named-query) diff --git a/persistence-modules/hibernate-queries/pom.xml b/persistence-modules/hibernate-queries/pom.xml index 20c2da9ea9..f0307a6eaf 100644 --- a/persistence-modules/hibernate-queries/pom.xml +++ b/persistence-modules/hibernate-queries/pom.xml @@ -14,6 +14,38 @@ + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework.data + spring-data-jpa + ${org.springframework.data.version} + + + org.apache.tomcat + tomcat-dbcp + ${tomcat-dbcp.version} + + + + + + com.google.guava + guava + ${guava.version} + + + + org.springframework + spring-test + ${org.springframework.version} + test + + org.hibernate hibernate-core @@ -49,9 +81,34 @@ jmh-generator-annprocess ${jmh-generator.version} - + + + com.sun.xml.bind + jaxb-core + ${com.sun.xml.version} + + + javax.xml.bind + jaxb-api + ${javax.xml.bind.version} + + + com.sun.xml.bind + jaxb-impl + ${com.sun.xml.version} + + + + 5.0.2.RELEASE + 1.10.6.RELEASE + + 5.2.10.Final + 9.0.0.M26 + 2.3.4 + 2.3.0.1 + 2.3.1 6.0.6 2.2.3 diff --git a/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java rename to persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/PersistenceConfig.java diff --git a/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/model/Item.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/model/Item.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/model/Item.java rename to persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/model/Item.java diff --git a/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java rename to persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java diff --git a/persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java rename to persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java diff --git a/persistence-modules/hibernate-queries-2/src/main/resources/import-db.sql b/persistence-modules/hibernate-queries/src/main/resources/import-db.sql similarity index 100% rename from persistence-modules/hibernate-queries-2/src/main/resources/import-db.sql rename to persistence-modules/hibernate-queries/src/main/resources/import-db.sql diff --git a/persistence-modules/hibernate-queries/src/main/resources/logback.xml b/persistence-modules/hibernate-queries/src/main/resources/logback.xml index 7d900d8ea8..612296c6ce 100644 --- a/persistence-modules/hibernate-queries/src/main/resources/logback.xml +++ b/persistence-modules/hibernate-queries/src/main/resources/logback.xml @@ -7,6 +7,12 @@ + + + + + + diff --git a/persistence-modules/hibernate-queries-2/src/main/resources/persistence-h2.properties b/persistence-modules/hibernate-queries/src/main/resources/persistence-h2.properties similarity index 100% rename from persistence-modules/hibernate-queries-2/src/main/resources/persistence-h2.properties rename to persistence-modules/hibernate-queries/src/main/resources/persistence-h2.properties diff --git a/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/SpringContextTest.java rename to persistence-modules/hibernate-queries/src/test/java/com/baeldung/SpringContextTest.java diff --git a/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java rename to persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java diff --git a/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java rename to persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java diff --git a/persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java similarity index 100% rename from persistence-modules/hibernate-queries-2/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java rename to persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java diff --git a/persistence-modules/hibernate-queries-2/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml b/persistence-modules/hibernate-queries/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml similarity index 100% rename from persistence-modules/hibernate-queries-2/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml rename to persistence-modules/hibernate-queries/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml diff --git a/persistence-modules/hibernate-queries-2/src/test/resources/criteria.cfg.xml b/persistence-modules/hibernate-queries/src/test/resources/criteria.cfg.xml similarity index 100% rename from persistence-modules/hibernate-queries-2/src/test/resources/criteria.cfg.xml rename to persistence-modules/hibernate-queries/src/test/resources/criteria.cfg.xml diff --git a/persistence-modules/hibernate-queries-2/src/test/resources/import-db.sql b/persistence-modules/hibernate-queries/src/test/resources/import-db.sql similarity index 100% rename from persistence-modules/hibernate-queries-2/src/test/resources/import-db.sql rename to persistence-modules/hibernate-queries/src/test/resources/import-db.sql From 054a3bcda4a3f4fc297b28977fb10f41e43ea1ac Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Thu, 17 Mar 2022 15:56:59 +0530 Subject: [PATCH 3/3] JAVA-10083 Changes as per review comments --- persistence-modules/hibernate-queries/pom.xml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/persistence-modules/hibernate-queries/pom.xml b/persistence-modules/hibernate-queries/pom.xml index f0307a6eaf..4f5de5c06e 100644 --- a/persistence-modules/hibernate-queries/pom.xml +++ b/persistence-modules/hibernate-queries/pom.xml @@ -82,33 +82,12 @@ ${jmh-generator.version} - - com.sun.xml.bind - jaxb-core - ${com.sun.xml.version} - - - javax.xml.bind - jaxb-api - ${javax.xml.bind.version} - - - com.sun.xml.bind - jaxb-impl - ${com.sun.xml.version} - - 5.0.2.RELEASE 1.10.6.RELEASE - - 5.2.10.Final 9.0.0.M26 - 2.3.4 - 2.3.0.1 - 2.3.1 6.0.6 2.2.3