[archiva] branch master updated: Adaption to generics changes in Redback interfaces

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/master by this push:
     new f59dd27  Adaption to generics changes in Redback interfaces
f59dd27 is described below

commit f59dd279cb743b90873f8c51bd880e2e4f8fe431
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Sun Apr 8 18:38:29 2018 +0200

    Adaption to generics changes in Redback interfaces
---
 .../archiva/consumers/lucene/test/TestRBACManager.java       |  2 +-
 .../web/security/ArchivaLockedAdminEnvironmentCheck.java     |  2 +-
 .../org/apache/archiva/web/security/ArchivaRbacManager.java  | 12 ++++++------
 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 7c237e2..adcc425 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 045e21d..c985f89 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 a98dc49..d5b65b8 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 );
 

-- 
To stop receiving notification emails like this one, please contact
marti...@apache.org.