openutils-svn

[Openutils-svn] SF.net SVN: openutils:[4044] branches/openutils-bshd5-backport/src/main/ java/it/openutils/dao/hibernate

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

Revision: 4044
          http://openutils.svn.sourceforge.net/openutils/?rev=4044&view=rev
Author:   gcatania
Date:     2012-05-20 16:49:05 +0000 (Sun, 20 May 2012)
Log Message:
-----------
backport: method signature compatibility

Modified Paths:
--------------
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2012-05-20 14:44:39 UTC (rev 4043)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2012-05-20 16:49:05 UTC (rev 4044)
@@ -203,7 +203,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata);
+    List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata);
 
     /**
      * Retrieve the entities handled by this DAO whose property values match, via <code>equals()</code> or via a
@@ -220,7 +220,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page);
+    List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page);
 
     /**
      * Retrieve the entities handled by this DAO whose property values match, via <code>equals()</code> or via a
@@ -239,8 +239,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
-        Order... orders);
+    List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page, Order... orders);
 
     /**
      * Retrieve the entities handled by this DAO whose property values match, via <code>equals()</code> or via a
@@ -260,8 +259,8 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
-        List< ? extends Criterion> criteria, Order... orders);
+    List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page,
+        List<Criterion> criteria, Order... orders);
 
     /**
      * Retrieve the first entity instance that matches the input <code>filter</code>, if existing.
@@ -305,7 +304,7 @@
      * @return the first matching instance of the entity class managed by this DAO, or <code>null</code> if none found
      * @see #findFiltered(T, List)
      */
-    T findFilteredFirst(T filter, List< ? extends Criterion> criteria);
+    T findFilteredFirst(T filter, List<Criterion> criteria);
 
     /**
      * Load object matching the given key and return it. Throw an exception if not found.
@@ -401,7 +400,7 @@
      * @deprecated use the correctly named {@link #find(Order[], List)} instead
      */
     @Deprecated
-    List<T> findAll(Order[] orderProperties, List< ? extends Criterion> criteria);
+    List<T> findAll(Order[] orderProperties, List<Criterion> criteria);
 
     /**
      * Retrieve the entities handled by this DAO whose property values match, via <code>equals()</code> or via a
@@ -420,8 +419,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<T> findFiltered(T filter, Order[] orders, Map<String, ? extends FilterMetadata> metadata, int maxResults,
-        int page);
+    List<T> findFiltered(T filter, Order[] orders, Map<String, FilterMetadata> metadata, int maxResults, int page);
 
     /**
      * Retrieve the entities handled by this DAO whose property values match, via <code>equals()</code> or via a
@@ -441,8 +439,8 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<T> findFiltered(T filter, Order[] orders, Map<String, ? extends FilterMetadata> metadata, int maxResults,
-        int page, List< ? extends Criterion> criteria);
+    List<T> findFiltered(T filter, Order[] orders, Map<String, FilterMetadata> metadata, int maxResults, int page,
+        List<Criterion> criteria);
 
     /**
      * Retrieve a set of properties from the entities returned by
@@ -462,7 +460,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<Object> findFilteredProperties(T filter, Order[] orders, Map<String, ? extends FilterMetadata> metadata,
-        int maxResults, int page, List< ? extends Criterion> criteria, List<String> properties);
+    List<Object> findFilteredProperties(T filter, Order[] orders, Map<String, FilterMetadata> metadata, int maxResults,
+        int page, List<Criterion> criteria, List<String> properties);
 
 }

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2012-05-20 14:44:39 UTC (rev 4043)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2012-05-20 16:49:05 UTC (rev 4044)
@@ -242,7 +242,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata)
+    public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata)
     {
         return getThis().findFiltered(
             filter,
@@ -258,7 +258,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page)
+    public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page)
     {
         return getThis().findFiltered(
             filter,
@@ -304,7 +304,7 @@
     /**
      * {@inheritDoc}
      */
-    public T findFilteredFirst(T filter, List< ? extends Criterion> criteria)
+    public T findFilteredFirst(T filter, List<Criterion> criteria)
     {
         ExampleTree exampleTree = new ExampleTree(filter);
         appendToRoot(exampleTree, criteria);
@@ -421,7 +421,7 @@
      * {@inheritDoc}
      */
     @Deprecated
-    public List<T> findAll(Order[] orders, List< ? extends Criterion> criteria)
+    public List<T> findAll(Order[] orders, List<Criterion> criteria)
     {
         return getThis().find(criteria, orders);
     }
@@ -459,8 +459,8 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<T> findFiltered(T filter, Order[] customOrder, Map<String, ? extends FilterMetadata> metadata,
-        int maxResults, int page)
+    public List<T> findFiltered(T filter, Order[] customOrder, Map<String, FilterMetadata> metadata, int maxResults,
+        int page)
     {
         return getThis().findFiltered(
             filter,
@@ -476,7 +476,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
+    public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page,
         Order... orders)
     {
         return getThis().findFiltered(filter, metadata, maxResults, page, Collections.<Criterion> emptyList(), orders);
@@ -487,8 +487,8 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
-        List< ? extends Criterion> criteria, Order... orders)
+    public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page,
+        List<Criterion> criteria, Order... orders)
     {
         return (List<T>) getHibernateTemplate().execute(
             new LegacySupportCallback<T>(filter, maxResults, page, metadata, criteria, orders));
@@ -499,8 +499,8 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<T> findFiltered(T filter, Order[] orders, Map<String, ? extends FilterMetadata> metadata,
-        int maxResults, int page, List< ? extends Criterion> criteria)
+    public List<T> findFiltered(T filter, Order[] orders, Map<String, FilterMetadata> metadata, int maxResults,
+        int page, List<Criterion> criteria)
     {
         return getThis().findFiltered(filter, metadata, maxResults, page, criteria, orders);
     }
@@ -510,9 +510,8 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<Object> findFilteredProperties(T filter, Order[] orders,
-        Map<String, ? extends FilterMetadata> metadata, int maxResults, int page, List< ? extends Criterion> criteria,
-        List<String> properties)
+    public List<Object> findFilteredProperties(T filter, Order[] orders, Map<String, FilterMetadata> metadata,
+        int maxResults, int page, List<Criterion> criteria, List<String> properties)
     {
         return (List<Object>) getHibernateTemplate().execute(
             new LegacySupportPropertiesCallback(filter, maxResults, page, metadata, criteria, properties, orders));
@@ -667,7 +666,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    protected Map<String, ? extends FilterMetadata> getDefaultFilterMetadata()
+    protected Map<String, FilterMetadata> getDefaultFilterMetadata()
     {
         return Collections.emptyMap();
     }
@@ -738,7 +737,7 @@
 
         private final T rootEntity;
 
-        private final Map<String, ? extends FilterMetadata> filterMetadata;
+        private final Map<String, FilterMetadata> filterMetadata;
 
         private final List< ? extends Criterion> additionalCriteria;
 
@@ -746,7 +745,7 @@
             T rootEntity,
             int maxResults,
             int page,
-            Map<String, ? extends FilterMetadata> metadata,
+            Map<String, FilterMetadata> metadata,
             List< ? extends Criterion> additionalCriteria,
             Order... orders)
         {
@@ -789,7 +788,7 @@
             T rootEntity,
             int maxResults,
             int page,
-            Map<String, ? extends FilterMetadata> metadata,
+            Map<String, FilterMetadata> metadata,
             List< ? extends Criterion> additionalCriteria,
             List<String> properties,
             Order... orders)

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

[Openutils-svn] SF.net SVN: openutils:[4063] branches/openutils-bshd5-backport/src/main/ java/it/openutils/dao/hibernate

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

Revision: 4063
          http://openutils.svn.sourceforge.net/openutils/?rev=4063&view=rev
Author:   gcatania
Date:     2012-06-08 16:21:47 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
BSHD-13 generic backwards compatibility fixes

Modified Paths:
--------------
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2012-06-06 22:27:54 UTC (rev 4062)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2012-06-08 16:21:47 UTC (rev 4063)
@@ -460,7 +460,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
      */
     @Deprecated
-    List<Object> findFilteredProperties(T filter, Order[] orders, Map<String, FilterMetadata> metadata, int maxResults,
+    List<?> findFilteredProperties(T filter, Order[] orders, Map<String, FilterMetadata> metadata, int maxResults,
         int page, List<Criterion> criteria, List<String> properties);
 
 }

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2012-06-06 22:27:54 UTC (rev 4062)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2012-06-08 16:21:47 UTC (rev 4063)
@@ -505,7 +505,7 @@
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
     @Deprecated
-    public List<Object> findFilteredProperties(T filter, Order[] orders, Map<String, FilterMetadata> metadata,
+    public List<?> findFilteredProperties(T filter, Order[] orders, Map<String, FilterMetadata> metadata,
         int maxResults, int page, List<Criterion> criteria, List<String> properties)
     {
         return (List<Object>) getHibernateTemplate().execute(

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