From 3af6986dab25cf0a03358e45c671d8b5b6a99496 Mon Sep 17 00:00:00 2001 From: glopez Date: Mon, 8 Jul 2019 07:25:28 -0300 Subject: [PATCH 1/4] BAEL-2804 JPA Query Parameters Usage - move article files to new module Move article files to other maven module since the previous one is already full. --- persistence-modules/java-jpa-2/README.md | 3 + persistence-modules/java-jpa-2/pom.xml | 94 +++++++++++++++++++ .../baeldung/jpa/queryparams/Employee.java | 0 .../main/resources/META-INF/persistence.xml | 31 ++++++ .../java-jpa-2/src/main/resources/logback.xml | 13 +++ .../queryparams/JPAQueryParamsUnitTest.java | 0 .../src/test/resources/queryparams.sql} | 0 persistence-modules/java-jpa/pom.xml | 57 ----------- .../main/resources/META-INF/persistence.xml | 22 ----- persistence-modules/pom.xml | 1 + 10 files changed, 142 insertions(+), 79 deletions(-) create mode 100644 persistence-modules/java-jpa-2/README.md create mode 100644 persistence-modules/java-jpa-2/pom.xml rename persistence-modules/{java-jpa => java-jpa-2}/src/main/java/com/baeldung/jpa/queryparams/Employee.java (100%) create mode 100644 persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml create mode 100644 persistence-modules/java-jpa-2/src/main/resources/logback.xml rename persistence-modules/{java-jpa => java-jpa-2}/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java (100%) rename persistence-modules/{java-jpa/src/test/resources/employees2.sql => java-jpa-2/src/test/resources/queryparams.sql} (100%) diff --git a/persistence-modules/java-jpa-2/README.md b/persistence-modules/java-jpa-2/README.md new file mode 100644 index 0000000000..ca31627ebc --- /dev/null +++ b/persistence-modules/java-jpa-2/README.md @@ -0,0 +1,3 @@ +# Relevant Articles + +- [JPA Query Parameters Usage](http://www.baeldung.com/jpa-query-parameters-usage) diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml new file mode 100644 index 0000000000..0bfd040222 --- /dev/null +++ b/persistence-modules/java-jpa-2/pom.xml @@ -0,0 +1,94 @@ + + 4.0.0 + java-jpa-2 + java-jpa-2 + + com.baeldung + persistence-modules + 1.0.0-SNAPSHOT + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-jpamodelgen + ${hibernate.version} + + + com.h2database + h2 + ${h2.version} + + + + + javax.persistence + javax.persistence-api + 2.2 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + -proc:none + + + + org.bsc.maven + maven-processor-plugin + 3.3.3 + + + process + + process + + generate-sources + + target/metamodel + + org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + add-source + generate-sources + + add-source + + + + target/metamodel + + + + + + + + + 5.4.0.Final + + + \ No newline at end of file diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java similarity index 100% rename from persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java rename to persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java diff --git a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000000..653ab83a18 --- /dev/null +++ b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,31 @@ + + + + + org.hibernate.jpa.HibernatePersistenceProvider + com.baeldung.jpa.queryparams.Employee + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-modules/java-jpa-2/src/main/resources/logback.xml b/persistence-modules/java-jpa-2/src/main/resources/logback.xml new file mode 100644 index 0000000000..7d900d8ea8 --- /dev/null +++ b/persistence-modules/java-jpa-2/src/main/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java similarity index 100% rename from persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java rename to persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java diff --git a/persistence-modules/java-jpa/src/test/resources/employees2.sql b/persistence-modules/java-jpa-2/src/test/resources/queryparams.sql similarity index 100% rename from persistence-modules/java-jpa/src/test/resources/employees2.sql rename to persistence-modules/java-jpa-2/src/test/resources/queryparams.sql diff --git a/persistence-modules/java-jpa/pom.xml b/persistence-modules/java-jpa/pom.xml index 51cc401332..f23040fbdc 100644 --- a/persistence-modules/java-jpa/pom.xml +++ b/persistence-modules/java-jpa/pom.xml @@ -19,11 +19,6 @@ hibernate-core ${hibernate.version} - - org.hibernate - hibernate-jpamodelgen - ${hibernate.version} - com.h2database h2 @@ -52,58 +47,6 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - -proc:none - - - - org.bsc.maven - maven-processor-plugin - 3.3.3 - - - process - - process - - generate-sources - - target/metamodel - - org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - add-source - generate-sources - - add-source - - - - target/metamodel - - - - - - - 5.4.0.Final 2.7.4-RC1 diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml index 6a236f0840..1f16bee3ba 100644 --- a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml +++ b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml @@ -224,26 +224,4 @@ value="products_jpa.sql" /> - - - org.hibernate.jpa.HibernatePersistenceProvider - com.baeldung.jpa.queryparams.Employee - true - - - - - - - - - - - - \ No newline at end of file diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index ba3baf6636..05b2c8e090 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -56,5 +56,6 @@ spring-hibernate4 spring-jpa spring-persistence-simple + java-jpa-2 From acd87d8e58f421b94698138e7f473cf5129e4d98 Mon Sep 17 00:00:00 2001 From: glopez Date: Sun, 14 Jul 2019 11:03:53 -0300 Subject: [PATCH 2/4] BAEL-2804 JPA Query Parameters Usage - formatting fixes --- persistence-modules/java-jpa-2/pom.xml | 174 ++++++++++++------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml index 0bfd040222..5e04a99f89 100644 --- a/persistence-modules/java-jpa-2/pom.xml +++ b/persistence-modules/java-jpa-2/pom.xml @@ -1,94 +1,94 @@ - 4.0.0 - java-jpa-2 - java-jpa-2 - - com.baeldung - persistence-modules - 1.0.0-SNAPSHOT - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-jpamodelgen - ${hibernate.version} - - - com.h2database - h2 - ${h2.version} - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + java-jpa-2 + java-jpa-2 + + com.baeldung + persistence-modules + 1.0.0-SNAPSHOT + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-jpamodelgen + ${hibernate.version} + + + com.h2database + h2 + ${h2.version} + - - - javax.persistence - javax.persistence-api - 2.2 - + + + javax.persistence + javax.persistence-api + 2.2 + - + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - -proc:none - - - - org.bsc.maven - maven-processor-plugin - 3.3.3 - - - process - - process - - generate-sources - - target/metamodel - - org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + -proc:none + + + + org.bsc.maven + maven-processor-plugin + 3.3.3 + + + process + + process + + generate-sources + + target/metamodel + + org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + + + - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - add-source - generate-sources - - add-source - - - - target/metamodel - - - - - - - - - 5.4.0.Final - + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + add-source + generate-sources + + add-source + + + + target/metamodel + + + + + + + + + 5.4.0.Final + \ No newline at end of file From 2a4adf293579f3d8a9b13e18a6a95cda69c75fb7 Mon Sep 17 00:00:00 2001 From: glopez Date: Sun, 4 Aug 2019 21:39:46 -0300 Subject: [PATCH 3/4] BAEL-2804 JPA Query Parameters Usage - formatting issues fixed I fixed some formatting issues as requested since the eclipse formatter does not support 4 spaces for blocks a 2 for continuations hence it has to be resolved manually. Additionally I've applied formatting to the logback.xml file. --- .../java-jpa-2/src/main/resources/logback.xml | 19 ++++++++++--------- .../queryparams/JPAQueryParamsUnitTest.java | 14 +++++++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/persistence-modules/java-jpa-2/src/main/resources/logback.xml b/persistence-modules/java-jpa-2/src/main/resources/logback.xml index 7d900d8ea8..e0098e7c7e 100644 --- a/persistence-modules/java-jpa-2/src/main/resources/logback.xml +++ b/persistence-modules/java-jpa-2/src/main/resources/logback.xml @@ -1,13 +1,14 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + - - - + + + \ No newline at end of file diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java index 4f320935cf..55ee0e6e59 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java @@ -36,7 +36,7 @@ public class JPAQueryParamsUnitTest { TypedQuery query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber = ?1", Employee.class); String empNumber = "A123"; Employee employee = query.setParameter(1, empNumber) - .getSingleResult(); + .getSingleResult(); Assert.assertNotNull("Employee not found", employee); } @@ -45,7 +45,7 @@ public class JPAQueryParamsUnitTest { TypedQuery query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber IN (?1)", Employee.class); List empNumbers = Arrays.asList("A123", "A124"); List employees = query.setParameter(1, empNumbers) - .getResultList(); + .getResultList(); Assert.assertNotNull("Employees not found", employees); Assert.assertFalse("Employees not found", employees.isEmpty()); } @@ -55,7 +55,7 @@ public class JPAQueryParamsUnitTest { TypedQuery query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber = :number", Employee.class); String empNumber = "A123"; Employee employee = query.setParameter("number", empNumber) - .getSingleResult(); + .getSingleResult(); Assert.assertNotNull("Employee not found", employee); } @@ -64,7 +64,7 @@ public class JPAQueryParamsUnitTest { TypedQuery query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber IN (:numbers)", Employee.class); List empNumbers = Arrays.asList("A123", "A124"); List employees = query.setParameter("numbers", empNumbers) - .getResultList(); + .getResultList(); Assert.assertNotNull("Employees not found", employees); Assert.assertFalse("Employees not found", employees.isEmpty()); } @@ -75,8 +75,8 @@ public class JPAQueryParamsUnitTest { String empName = "John Doe"; int empAge = 55; List employees = query.setParameter("name", empName) - .setParameter("empAge", empAge) - .getResultList(); + .setParameter("empAge", empAge) + .getResultList(); Assert.assertNotNull("Employees not found!", employees); Assert.assertTrue("Employees not found!", !employees.isEmpty()); } @@ -89,7 +89,7 @@ public class JPAQueryParamsUnitTest { Root c = cQuery.from(Employee.class); ParameterExpression paramEmpNumber = cb.parameter(String.class); cQuery.select(c) - .where(cb.equal(c.get(Employee_.empNumber), paramEmpNumber)); + .where(cb.equal(c.get(Employee_.empNumber), paramEmpNumber)); TypedQuery query = entityManager.createQuery(cQuery); String empNumber = "A123"; From b7e02dbb4a1217a02d4d44acd99b19a8fd1dde56 Mon Sep 17 00:00:00 2001 From: Guillermo Lopez Date: Wed, 7 Aug 2019 22:43:41 -0300 Subject: [PATCH 4/4] BAEL-2804 Fixed XML indentation I've set the XML indentation the same way as the rest of the modules using 4 spaces instead of 2. --- persistence-modules/java-jpa-2/pom.xml | 208 +++++++++--------- .../main/resources/META-INF/persistence.xml | 56 ++--- .../java-jpa-2/src/main/resources/logback.xml | 21 +- 3 files changed, 145 insertions(+), 140 deletions(-) diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml index dd200eb3cb..fdd482f833 100644 --- a/persistence-modules/java-jpa-2/pom.xml +++ b/persistence-modules/java-jpa-2/pom.xml @@ -1,111 +1,111 @@ - 4.0.0 - java-jpa-2 - java-jpa-2 - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - ../../pom.xml - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-jpamodelgen - ${hibernate.version} - - - com.h2database - h2 - ${h2.version} - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + java-jpa-2 + java-jpa-2 + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + ../../pom.xml + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-jpamodelgen + ${hibernate.version} + + + com.h2database + h2 + ${h2.version} + - - - javax.persistence - javax.persistence-api - ${javax.persistence-api.version} - + + + javax.persistence + javax.persistence-api + ${javax.persistence-api.version} + - - - org.eclipse.persistence - eclipselink - ${eclipselink.version} - runtime - - - org.postgresql - postgresql - ${postgres.version} - runtime - - + + + org.eclipse.persistence + eclipselink + ${eclipselink.version} + runtime + + + org.postgresql + postgresql + ${postgres.version} + runtime + + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - -proc:none - - - - org.bsc.maven - maven-processor-plugin - 3.3.3 - - - process - - process - - generate-sources - - target/metamodel - - org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + -proc:none + + + + org.bsc.maven + maven-processor-plugin + 3.3.3 + + + process + + process + + generate-sources + + target/metamodel + + org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + + + - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - add-source - generate-sources - - add-source - - - - target/metamodel - - - - - - - - - 5.4.0.Final - 2.7.4-RC1 - 42.2.5 - 2.2 - + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + add-source + generate-sources + + add-source + + + + target/metamodel + + + + + + + + + 5.4.0.Final + 2.7.4-RC1 + 42.2.5 + 2.2 + \ No newline at end of file diff --git a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml index 653ab83a18..560a75070c 100644 --- a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml +++ b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml @@ -1,31 +1,35 @@ + version="2.2"> - - org.hibernate.jpa.HibernatePersistenceProvider - com.baeldung.jpa.queryparams.Employee - true - - - - - - - - - - - - + + org.hibernate.jpa.HibernatePersistenceProvider + com.baeldung.jpa.queryparams.Employee + true + + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-modules/java-jpa-2/src/main/resources/logback.xml b/persistence-modules/java-jpa-2/src/main/resources/logback.xml index e0098e7c7e..2527fea245 100644 --- a/persistence-modules/java-jpa-2/src/main/resources/logback.xml +++ b/persistence-modules/java-jpa-2/src/main/resources/logback.xml @@ -1,14 +1,15 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - + %msg%n + + + - - - + + + \ No newline at end of file