Close #20, close #21, close #22

Author: fparoni

core/src/main/java/com/holonplatform/datastore/jpa/querydsl/internal/DefaultJpaDeleteClause.java

@@ -15,7 +15,7 @@
  */
 package com.holonplatform.datastore.jpa.querydsl.internal;
 
-import java.util.Map;
+import java.util.List;
 
 import javax.persistence.Query;
 
@@ -71,7 +71,7 @@ public long execute() {
 
 			JPQLSerializer serializer = new JPQLSerializer(JPAProvider.getTemplates(entityManager), entityManager);
 			serializer.serializeForDelete(queryMixin.getMetadata());
-			Map<Object, String> constants = serializer.getConstantToLabel();
+			List<Object> constants = serializer.getConstants();
 
 			// trace
 			final String queryString = serializer.toString();

core/src/main/java/com/holonplatform/datastore/jpa/querydsl/internal/DefaultJpaQuery.java

@@ -99,9 +99,7 @@
 
 /**
  * Default {@link JpaQuery} implementation.
- * 
  * @param <T> Query result type
- * 
  * @since 5.0.0
  */
 public class DefaultJpaQuery<T> implements JpaQuery<T> {
@@ -167,8 +165,8 @@ public QueryConfiguration getQueryConfiguration() {
 	/*
 	 * (non-Javadoc)
 	 * @see
-	 * com.holonplatform.core.ExpressionResolver.ExpressionResolverBuilder#withExpressionResolver(com.holonplatform.core
-	 * .ExpressionResolver)
+	 * com.holonplatform.core.ExpressionResolver.ExpressionResolverBuilder#withExpressionResolver(com.holonplatform.
+	 * core .ExpressionResolver)
 	 */
 	@Override
 	public <E extends com.holonplatform.core.Expression, R extends com.holonplatform.core.Expression> JpaQuery<T> withExpressionResolver(
@@ -235,8 +233,8 @@ public <C> JpaQuery<T> parameter(ConfigProperty<C> property, C value) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see
-	 * com.holonplatform.core.datastore.DataTarget.DataTargetSupport#target(com.holonplatform.core.datastore.DataTarget)
+	 * @see com.holonplatform.core.datastore.DataTarget.DataTargetSupport#target(com.holonplatform.core.datastore.
+	 * DataTarget)
 	 */
 	@Override
 	public JpaQuery<T> target(DataTarget<?> target) {
@@ -354,7 +352,8 @@ public <P> JpaQuery<T> innerJoin(EntityPath<P> target, Path<P> alias) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see com.holonplatform.datastore.jpa.querydsl.JpaQuery#innerJoin(com.querydsl.core.types.CollectionExpression)
+	 * @see
+	 * com.holonplatform.datastore.jpa.querydsl.JpaQuery#innerJoin(com.querydsl.core.types.CollectionExpression)
 	 */
 	@Override
 	public <P> JpaQuery<T> innerJoin(CollectionExpression<?, P> target) {
@@ -363,7 +362,8 @@ public <P> JpaQuery<T> innerJoin(CollectionExpression<?, P> target) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see com.holonplatform.datastore.jpa.querydsl.JpaQuery#innerJoin(com.querydsl.core.types.CollectionExpression,
+	 * @see
+	 * com.holonplatform.datastore.jpa.querydsl.JpaQuery#innerJoin(com.querydsl.core.types.CollectionExpression,
 	 * com.querydsl.core.types.Path)
 	 */
 	@Override
@@ -525,7 +525,8 @@ public <P> JpaQuery<T> rightJoin(EntityPath<P> target, Path<P> alias) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see com.holonplatform.datastore.jpa.querydsl.JpaQuery#rightJoin(com.querydsl.core.types.CollectionExpression)
+	 * @see
+	 * com.holonplatform.datastore.jpa.querydsl.JpaQuery#rightJoin(com.querydsl.core.types.CollectionExpression)
 	 */
 	@Override
 	public <P> JpaQuery<T> rightJoin(CollectionExpression<?, P> target) {
@@ -534,7 +535,8 @@ public <P> JpaQuery<T> rightJoin(CollectionExpression<?, P> target) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see com.holonplatform.datastore.jpa.querydsl.JpaQuery#rightJoin(com.querydsl.core.types.CollectionExpression,
+	 * @see
+	 * com.holonplatform.datastore.jpa.querydsl.JpaQuery#rightJoin(com.querydsl.core.types.CollectionExpression,
 	 * com.querydsl.core.types.Path)
 	 */
 	@Override
@@ -1063,7 +1065,7 @@ protected Query createQuery(JPQLTemplates jpqlTemplates, EntityManager entityMan
 		operationContext.trace(queryString.replace('\n', ' '));
 
 		final Query query = entityManager.createQuery(queryString);
-		JPAUtil.setConstants(query, serializer.getConstantToLabel(), getMetadata().getParams());
+		JPAUtil.setConstants(query, serializer.getConstants(), getMetadata().getParams());
 
 		// check restrictions
 		if (modifiers != null && modifiers.isRestricting()) {

core/src/main/java/com/holonplatform/datastore/jpa/querydsl/internal/DefaultJpaUpdateClause.java

@@ -38,7 +38,6 @@
 
 /**
  * Default {@link JpaUpdateClause} implementation.
- *
  * @since 5.1.0
  */
 public class DefaultJpaUpdateClause implements JpaUpdateClause {
@@ -141,7 +140,7 @@ public long execute() {
 
 			JPQLSerializer serializer = new JPQLSerializer(JPAProvider.getTemplates(entityManager), entityManager);
 			serializer.serializeForUpdate(queryMixin.getMetadata(), updates);
-			Map<Object, String> constants = serializer.getConstantToLabel();
+			List<Object> constants = serializer.getConstants();
 
 			// trace
 			final String queryString = serializer.toString();

pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.holon-platform</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.6</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<groupId>com.holon-platform.jpa</groupId>
@@ -55,24 +55,24 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- Holon core -->
-		<holon.core.version>5.5.0</holon.core.version>
+		<holon.core.version>5.7.0</holon.core.version>
 		<!-- Holon JPA -->
-		<holon.jpa.version>5.5.0</holon.jpa.version>
+		<holon.jpa.version>5.7.0</holon.jpa.version>
 
 		<!-- QueryDSL -->
-		<querydsl.version>4.3.1</querydsl.version>
+		<querydsl.version>5.0.0</querydsl.version>
 
 		<!-- JPA API -->
 		<jpa.api.version>2.2</jpa.api.version>
 
 		<!-- Test: H2 -->
 		<h2.version>1.4.200</h2.version>
 		<!-- Test: HikariCP -->
-		<hikaricp.version>3.4.5</hikaricp.version>
+		<hikaricp.version>5.0.1</hikaricp.version>
 		<!-- Test: Hibernate -->
-		<hibernate.version>5.4.18.Final</hibernate.version>
+		<hibernate.version>5.6.15.Final</hibernate.version>
 		<!-- Test: Eclipselink -->
-		<eclipselink.version>2.7.7</eclipselink.version>
+		<eclipselink.version>2.7.13</eclipselink.version>
 
 	</properties>