[Openutils-svn] SF.net SVN: openutils:[4038] trunk/openutils-bshd5/src

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

Revision: 4038
          http://openutils.svn.sourceforge.net/openutils/?rev=4038&view=rev
Author:   gcatania
Date:     2012-05-20 14:13:06 +0000 (Sun, 20 May 2012)
Log Message:
-----------
BSHD-2 fix property methods

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

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2012-05-20 13:12:26 UTC (rev 4037)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2012-05-20 14:13:06 UTC (rev 4038)
@@ -175,7 +175,7 @@
      * @param orders the orders to apply with respect to entity class properties
      * @return a list of distinct entity instances (never null)
      */
-    List<Object[]> findFilteredProperties(T filter, int maxResults, int page, List<String> properties, Order... orders);
+    List<Object> findFilteredProperties(T filter, int maxResults, int page, List<String> properties, Order... orders);
 
     /**
      * Retrieve a set of properties from the entities returned by
@@ -189,7 +189,7 @@
      * @param orders the orders to apply with respect to entity class properties
      * @return a list of distinct entity instances (never null)
      */
-    List<Object[]> findFilteredProperties(ExampleTree exampleTree, int maxResults, int page, List<String> properties,
+    List<Object> findFilteredProperties(ExampleTree exampleTree, int maxResults, int page, List<String> properties,
         Order... orders);
 
     /**
@@ -462,7 +462,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<Object[]> findFilteredProperties(T filter, Order[] orders, Map<String, ? extends FilterMetadata> metadata,
+    List<Object> findFilteredProperties(T filter, Order[] orders, Map<String, ? extends FilterMetadata> metadata,
         int maxResults, int page, List< ? extends Criterion> criteria, List<String> properties);
 
 }

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	2012-05-20 13:12:26 UTC (rev 4037)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2012-05-20 14:13:06 UTC (rev 4038)
@@ -436,7 +436,7 @@
     /**
      * {@inheritDoc}
      */
-    public List<Object[]> findFilteredProperties(T filter, int maxResults, int page, List<String> properties,
+    public List<Object> findFilteredProperties(T filter, int maxResults, int page, List<String> properties,
         Order... orders)
     {
         return getThis().findFilteredProperties(new ExampleTree(filter), maxResults, page, properties, orders);
@@ -445,7 +445,7 @@
     /**
      * {@inheritDoc}
      */
-    public List<Object[]> findFilteredProperties(ExampleTree exampleTree, int maxResults, int page,
+    public List<Object> findFilteredProperties(ExampleTree exampleTree, int maxResults, int page,
         List<String> properties, Order... orders)
     {
         return getHibernateTemplate().execute(
@@ -508,7 +508,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<Object[]> findFilteredProperties(T filter, Order[] orders,
+    public List<Object> findFilteredProperties(T filter, Order[] orders,
         Map<String, ? extends FilterMetadata> metadata, int maxResults, int page, List< ? extends Criterion> criteria,
         List<String> properties)
     {
@@ -778,7 +778,7 @@
      * @author gcatania
      */
     @SuppressWarnings("deprecation")
-    private final class LegacySupportPropertiesCallback extends LegacySupportCallback<Object[]>
+    private final class LegacySupportPropertiesCallback extends LegacySupportCallback<Object>
     {
 
         private final List<String> properties;
@@ -871,7 +871,7 @@
 }
 
 
-class ExampleTreePropertiesCallback extends ExampleTreeCallback<Object[]>
+class ExampleTreePropertiesCallback extends ExampleTreeCallback<Object>
 {
 
     private final List<String> properties;

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-05-20 13:12:26 UTC (rev 4037)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-05-20 14:13:06 UTC (rev 4038)
@@ -402,7 +402,7 @@
         st1.setHeight(20d);
         st1.setWidth(10d);
         Sticker st2 = new Sticker();
-        st2.setName("Object in the mirror are losing");
+        st2.setName("Objects in the mirror are losing");
         st2.setHeight(5d);
         st2.setWidth(10d);
         Sticker st3 = new Sticker();
@@ -423,8 +423,10 @@
     @Test
     public void testFindFilteredProperties()
     {
-        personDAO.save(alice());
-        personDAO.save(bob());
+        Person alice = alice();
+        Person bob = bob();
+        personDAO.save(alice);
+        personDAO.save(bob);
         personDAO.save(chuck());
 
         Address addressFilter = new Address();
@@ -432,21 +434,32 @@
         Person filter = new Person();
         filter.setCurrentAddress(addressFilter);
 
-        List<Object[]> foundProperties = personDAO.findFilteredProperties(
+        List<Object> foundProperties = personDAO.findFilteredProperties(
             filter,
             Integer.MAX_VALUE,
             0,
+            Collections.singletonList("fiscalAddress"));
+
+        Assert.assertEquals(foundProperties.size(), 2);
+
+        Assert.assertEquals(foundProperties.get(0), alice.getFiscalAddress());
+        Assert.assertEquals(foundProperties.get(1), bob.getFiscalAddress());
+
+        foundProperties = personDAO.findFilteredProperties(
+            filter,
+            Integer.MAX_VALUE,
+            0,
             Arrays.asList("name", "birthDate"),
             Order.desc("name.givenName"));
 
         Assert.assertEquals(foundProperties.size(), 2);
 
-        Object[] bobsProperties = foundProperties.get(0);
-        Assert.assertEquals(bobsProperties[0], bob().getName());
-        Assert.assertEquals(bobsProperties[1], bob().getBirthDate());
-        Object[] alicesProperties = foundProperties.get(1);
-        Assert.assertEquals(alicesProperties[0], alice().getName());
-        Assert.assertEquals(alicesProperties[1], alice().getBirthDate());
+        Object[] bobsProperties = (Object[]) foundProperties.get(0);
+        Assert.assertEquals(bobsProperties[0], bob.getName());
+        Assert.assertEquals(bobsProperties[1], bob.getBirthDate());
+        Object[] alicesProperties = (Object[]) foundProperties.get(1);
+        Assert.assertEquals(alicesProperties[0], alice.getName());
+        Assert.assertEquals(alicesProperties[1], alice.getBirthDate());
 
     }
     // @Test

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