openutils-svn

[Openutils-svn] SF.net SVN: openutils:[4080] trunk/openutils-bshd5/src/main/java/it/ openutils/hibernate/example/FilterMetadataSupport.java

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

Revision: 4080
          http://openutils.svn.sourceforge.net/openutils/?rev=4080&view=rev
Author:   gcatania
Date:     2012-06-29 16:27:22 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
fix filter metadata support

Modified Paths:
--------------
    trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2012-06-29 16:11:44 UTC (rev 4079)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2012-06-29 16:27:22 UTC (rev 4080)
@@ -130,7 +130,7 @@
                 }
                 Object propertyValue = classMetadata.getPropertyValue(entity, propertyName, entityMode);
                 FilterMetadata fm = currFilterMetadata.get(propertyName);
-                if (fm != null)
+                if (fm != null && propertyValue != null)
                 {
                     fm.createFilter(crit, propertyName, propertyValue);
                     continue;

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

[Openutils-svn] SF.net SVN: openutils:[4085] trunk/openutils-bshd5/src/main/java/it/ openutils/hibernate/example/FilterMetadataSupport.java

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

Revision: 4085
          http://openutils.svn.sourceforge.net/openutils/?rev=4085&view=rev
Author:   gcatania
Date:     2012-06-29 16:55:25 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
fix filter metadata support not working for empty filter metadata

Modified Paths:
--------------
    trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2012-06-29 16:51:34 UTC (rev 4084)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2012-06-29 16:55:25 UTC (rev 4085)
@@ -27,11 +27,11 @@
 
 import it.openutils.hibernate.selectors.ExcludeBackrefPropertySelector;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.MapUtils;
 import org.hibernate.Criteria;
 import org.hibernate.EntityMode;
 import org.hibernate.Hibernate;
@@ -65,7 +65,7 @@
             throw new NullPointerException("Null entity.");
         }
         this.entity = entity;
-        this.filterMetadata = filterMetadata;
+        this.filterMetadata = filterMetadata != null ? filterMetadata : Collections.<String, FilterMetadata> emptyMap();
     }
 
     /**
@@ -106,10 +106,7 @@
 
         public Criteria walk(Criteria rootCriteria, Object rootEntity)
         {
-            if (MapUtils.isNotEmpty(filterMetadata))
-            {
-                createSubExamples(rootCriteria, rootEntity, new String[0]);
-            }
+            createSubExamples(rootCriteria, rootEntity, new String[0]);
             return rootCriteria;
         }
 

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