Adaption to generics changes in Redback interfaces

3 files changed, 8 insertions, 8 deletions

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
index 7c237e2c0..adcc42550 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
@@ -438,7 +438,7 @@ public class TestRBACManager implements RBACManager
     }
 
     @Override
-    public Map<String, List<Permission>> getAssignedPermissionMap( String principal )
+    public Map<String, List<? extends Permission>> getAssignedPermissionMap( String principal )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
index 045e21de3..c985f896e 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
@@ -114,7 +114,7 @@ public class ArchivaLockedAdminEnvironmentCheck
                 List<String> roles = new ArrayList<>();
                 roles.add( RedbackRoleConstants.SYSTEM_ADMINISTRATOR_ROLE );
 
-                List<UserAssignment> systemAdminstrators;
+                List<? extends UserAssignment> systemAdminstrators;
                 try
                 {
                     systemAdminstrators = rbacManager.getUserAssignmentsForRoles( roles );
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
index a98dc4998..d5b65b8e4 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
@@ -262,7 +262,7 @@ public class ArchivaRbacManager
         {
             try
             {
-                List<Role> roles = rbacManager.getAllRoles();
+                List<? extends Role> roles = rbacManager.getAllRoles();
                 for ( Role role : roles )
                 {
                     allRoles.put( role.getName(), role );
@@ -400,7 +400,7 @@ public class ArchivaRbacManager
         {
             try
             {
-                List<Permission> permissions = rbacManager.getAllPermissions();
+                List<? extends Permission> permissions = rbacManager.getAllPermissions();
                 for ( Permission p : permissions )
                 {
                     allPermissions.put( p.getName(), p );
@@ -529,7 +529,7 @@ public class ArchivaRbacManager
         {
             try
             {
-                List<Operation> operations = rbacManager.getAllOperations();
+                List<? extends Operation> operations = rbacManager.getAllOperations();
                 for ( Operation o : operations )
                 {
                     allOperations.put( o.getName(), o );
@@ -658,7 +658,7 @@ public class ArchivaRbacManager
         {
             try
             {
-                List<Resource> resources = rbacManager.getAllResources();
+                List<? extends Resource> resources = rbacManager.getAllResources();
                 for ( Resource r : resources )
                 {
                     allResources.put( r.getIdentifier(), r );
@@ -846,7 +846,7 @@ public class ArchivaRbacManager
         {
             try
             {
-                List<UserAssignment> userAssignments = rbacManager.getAllUserAssignments();
+                List<? extends UserAssignment> userAssignments = rbacManager.getAllUserAssignments();
                 for ( UserAssignment ua : userAssignments )
                 {
                     UserAssignment userAssignment = allUserAssignments.get( ua.getPrincipal() );
@@ -885,7 +885,7 @@ public class ArchivaRbacManager
         {
             try
             {
-                List<UserAssignment> userAssignments = rbacManager.getUserAssignmentsForRoles( roleNames );
+                List<? extends UserAssignment> userAssignments = rbacManager.getUserAssignmentsForRoles( roleNames );
 
                 allUserAssignments.addAll( userAssignments );