[Openutils-svn] SF.net SVN: openutils:[4624] trunk/openutils-bshd5/src/main/java/it/ openutils/dao/hibernate/HibernateDAOImpl.java

[<gca...@us...>]

Revision: 4624
          http://openutils.svn.sourceforge.net/openutils/?rev=4624&view=rev
Author:   gcatania
Date:     2015-04-17 08:43:39 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
BSHD-27 regression after refactoring - distinct root entity transformer got lost

Modified Paths:
--------------
    trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2015-04-13 19:46:54 UTC (rev 4623)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2015-04-17 08:43:39 UTC (rev 4624)
@@ -796,7 +796,8 @@
         @Override
         protected Criteria createCriteria(Session session)
         {
-            Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session);
+            Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session).setResultTransformer(
+                CriteriaSpecification.DISTINCT_ROOT_ENTITY);
             if (additionalCriteria != null)
             {
                 for (Criterion c : additionalCriteria)
@@ -829,19 +830,14 @@
         {
             super(rootEntity, maxResults, page, metadata, additionalCriteria, orders);
             this.properties = properties;
-
         }
 
         @Override
         protected Criteria createCriteria(Session session)
         {
             Criteria crit = super.createCriteria(session);
-            if (CollectionUtils.isEmpty(properties))
+            if (CollectionUtils.isNotEmpty(properties))
             {
-                crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
-            }
-            else
-            {
                 ProjectionList projectionList = Projections.projectionList();
                 for (String property : properties)
                 {
@@ -923,7 +919,7 @@
     @Override
     protected Criteria createCriteria(Session session)
     {
-        return exampleTree.create(session);
+        return exampleTree.create(session).setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
     }
 }
 
@@ -948,12 +944,8 @@
     protected Criteria createCriteria(Session session)
     {
         Criteria crit = super.createCriteria(session);
-        if (CollectionUtils.isEmpty(properties))
+        if (CollectionUtils.isNotEmpty(properties))
         {
-            crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
-        }
-        else
-        {
             ProjectionList projectionList = Projections.projectionList();
             for (String property : properties)
             {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.