add more generics

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1429817 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
index 9451880f5842de82e95a1d32c8f6145c21c147aa..ae52d209b59470ae52f1f0f7cda2f7f2ed89897a 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
@@ -132,7 +132,7 @@ public class JdoRbacManager
     public Role getRole( String roleName )
         throws RbacObjectNotFoundException, RbacManagerException
     {
-        return (Role) jdo.getObjectById( JdoRole.class, roleName, ROLE_DETAIL );
+        return jdo.getObjectById( JdoRole.class, roleName, ROLE_DETAIL );
     }
 
     /**
@@ -309,7 +309,7 @@ public class JdoRbacManager
     public Permission getPermission( String permissionName )
         throws RbacObjectNotFoundException, RbacManagerException
     {
-        return (Permission) jdo.getObjectById( JdoPermission.class, permissionName, null );
+        return jdo.getObjectById( JdoPermission.class, permissionName, null );
     }
 
     @SuppressWarnings( "unchecked" )
@@ -392,7 +392,7 @@ public class JdoRbacManager
     public Operation getOperation( String operationName )
         throws RbacObjectNotFoundException, RbacManagerException
     {
-        return (Operation) jdo.getObjectById( JdoOperation.class, operationName, null );
+        return jdo.getObjectById( JdoOperation.class, operationName, null );
     }
 
     @SuppressWarnings( "unchecked" )
@@ -477,7 +477,7 @@ public class JdoRbacManager
     public Resource getResource( String resourceIdentifier )
         throws RbacObjectNotFoundException, RbacManagerException
     {
-        return (Resource) jdo.getObjectById( JdoResource.class, resourceIdentifier, null );
+        return jdo.getObjectById( JdoResource.class, resourceIdentifier, null );
     }
 
     @SuppressWarnings( "unchecked" )
@@ -568,7 +568,7 @@ public class JdoRbacManager
     public UserAssignment getUserAssignment( String principal )
         throws RbacObjectNotFoundException, RbacManagerException
     {
-        return (UserAssignment) jdo.getObjectById( JdoUserAssignment.class, principal, ROLE_DETAIL );
+        return jdo.getObjectById( JdoUserAssignment.class, principal, ROLE_DETAIL );
     }
 
     /**

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
index 4566a759380fc12a9714f2d0f1b55798d07fa3a1..2d4233e396bb66fe07c0120dbcc0627b07377d8e 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
@@ -149,12 +149,12 @@ public class JdoTool
         cache.pinAll( clazz, false ); // Pin all objects of type clazz from now on
     }
 
-    public Object saveObject( Object object )
+    public <T>T saveObject( T object )
     {
-        return saveObject( object, null );
+        return (T) saveObject( object, null );
     }
 
-    public Object saveObject( Object object, String[] fetchGroups )
+    public <T>T saveObject( T object, String[] fetchGroups )
     {
         PersistenceManager pm = getPersistenceManager();
         Transaction tx = pm.currentTransaction();
@@ -180,7 +180,7 @@ public class JdoTool
 
             pm.makePersistent( object );
 
-            object = pm.detachCopy( object );
+            object = (T) pm.detachCopy( object );
 
             tx.commit();
 
@@ -289,7 +289,7 @@ public class JdoTool
         }
     }
 
-    public Object getObjectById( Class<?> clazz, String id, String fetchGroup )
+    public <T>T getObjectById( Class<T> clazz, String id, String fetchGroup )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         if ( StringUtils.isEmpty( id ) )
@@ -318,7 +318,7 @@ public class JdoTool
 
             tx.commit();
 
-            return object;
+            return (T) object;
         }
         catch ( JDOObjectNotFoundException e )
         {
@@ -355,7 +355,7 @@ public class JdoTool
         }
     }
 
-    public Object removeObject( Object o )
+    public <T>T removeObject( T o )
         throws RbacManagerException
     {
         if ( o == null )
@@ -370,7 +370,7 @@ public class JdoTool
         {
             tx.begin();
 
-            o = pm.getObjectById( pm.getObjectId( o ) );
+            o = (T) pm.getObjectById( pm.getObjectId( o ) );
 
             pm.deletePersistent( o );