svn commit: r1453905 - in /syncope/trunk/core/src/main/java/org/apache/syncope/core: rest/controller/PolicyController.java services/PolicyServiceImpl.java

[il...@apache.org]

Author: ilgrosso
Date: Thu Mar  7 15:00:24 2013
New Revision: 1453905

URL: http://svn.apache.org/r1453905
Log:
Spring MVC had troubles in dealing with empty collections: 'Cannot generate variable name for non-typed Collection return type and an empty Collection value'

Modified:
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java?rev=1453905&r1=1453904&r2=1453905&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java Thu Mar  7 15:00:24 2013
@@ -142,13 +142,13 @@ public class PolicyController extends Ab
 
     @PreAuthorize("hasRole('POLICY_LIST')")
     @RequestMapping(method = RequestMethod.GET, value = "/{kind}/list")
-    public <T extends PolicyTO> List<T> listByType(@PathVariable("kind") final String kind) {
+    public List<PolicyTO> list(@PathVariable("kind") final String kind) {
         LOG.debug("Listing policies");
         List<? extends Policy> policies = policyDAO.find(PolicyType.valueOf(kind.toUpperCase(Locale.ENGLISH)));
 
-        final List<T> policyTOs = new ArrayList<T>();
+        final List<PolicyTO> policyTOs = new ArrayList<PolicyTO>();
         for (Policy policy : policies) {
-            policyTOs.add(binder.<T>getPolicyTO(policy));
+            policyTOs.add(binder.getPolicyTO(policy));
         }
 
         auditManager.audit(Category.policy, PolicySubCategory.list, Result.success,

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java?rev=1453905&r1=1453904&r2=1453905&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java Thu Mar  7 15:00:24 2013
@@ -58,8 +58,9 @@ public class PolicyServiceImpl implement
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public <T extends PolicyTO> List<T> list(final PolicyType type) {
-        return policyController.listByType(type.toString());
+        return (List<T>) policyController.list(type.toString());
     }
 
     @Override